diff options
author | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
---|---|---|
committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
commit | b6981854dff11022e3de56e56cbf4633f1c49598 (patch) | |
tree | f5b8f4ff1425f704d791d5b9af9c8af65455868d /src/survive_config.h | |
parent | 94be8ccdbfb2f44c9bc569428537444030ba8eeb (diff) | |
parent | a53c520c2d1a3bb9faa4cb5e4ee9ccc48bb1835f (diff) | |
download | libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.gz libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.bz2 |
Merge branch 'master' into UsbTrackerOnWin
# Conflicts:
# src/survive_vive.c
Diffstat (limited to 'src/survive_config.h')
-rw-r--r-- | src/survive_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/survive_config.h b/src/survive_config.h index c8c7762..83db624 100644 --- a/src/survive_config.h +++ b/src/survive_config.h @@ -35,7 +35,7 @@ typedef struct config_group { //extern config_group global_config_values; //extern config_group lh_config[2]; //lighthouse configs -void init_config_group(config_group *cg, uint16_t count); +void init_config_group(config_group *cg, uint8_t count); void destroy_config_group(config_group* cg); //void config_init(); @@ -52,7 +52,7 @@ const uint32_t config_set_uint32(config_group *cg, const char *tag, const uint32 const char* config_set_str(config_group *cg, const char *tag, const char* value); FLT config_read_float(config_group *cg, const char *tag, const FLT def); -uint16_t config_read_float_array(config_group *cg, const char *tag, const FLT** values, const FLT* def, uint16_t count); +uint16_t config_read_float_array(config_group *cg, const char *tag, const FLT** values, const FLT* def, uint8_t count); uint32_t config_read_uint32(config_group *cg, const char *tag, const uint32_t def); const char* config_read_str(config_group *cg, const char *tag, const char *def); |