MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "GPS LOCK did not work when NMEA_PROVIDER follows it"

Browse source
This commit is contained in:
Linux Build Service Account 2014-10-21 18:29:20 -07:00 committed by Gerrit - the friendly Code Review server
commit 479171feae
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
loc_api/libloc_api_50001/loc_eng.h
View file

@ -140,6 +140,9 @@ typedef struct loc_eng_data_s
} loc_eng_data_s_type; } loc_eng_data_s_type;
/* GPS.conf support */ /* GPS.conf support */
/* NOTE: the implementaiton of the parser casts number
fields to 32 bit. To ensure all 'n' fields working,
they must all be 32 bit fields. */
typedef struct loc_gps_cfg_s typedef struct loc_gps_cfg_s
{ {
uint32_t INTERMEDIATE_POS; uint32_t INTERMEDIATE_POS;
@ -147,17 +150,24 @@ typedef struct loc_gps_cfg_s
uint32_t SUPL_VER; uint32_t SUPL_VER;
uint32_t CAPABILITIES; uint32_t CAPABILITIES;
uint32_t LPP_PROFILE; uint32_t LPP_PROFILE;
uint8_t NMEA_PROVIDER;
uint32_t XTRA_VERSION_CHECK; uint32_t XTRA_VERSION_CHECK;
char XTRA_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH]; char XTRA_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH];
char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH]; char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH];
char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH]; char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH];
uint32_t USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL; uint32_t USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL;
uint32_t NMEA_PROVIDER;
uint8_t GPS_LOCK; uint8_t GPS_LOCK;
uint32_t A_GLONASS_POS_PROTOCOL_SELECT; uint32_t A_GLONASS_POS_PROTOCOL_SELECT;
uint32_t AGPS_CERT_WRITABLE_MASK; uint32_t AGPS_CERT_WRITABLE_MASK;
} loc_gps_cfg_s_type; } loc_gps_cfg_s_type;
/* NOTE: the implementaiton of the parser casts number
fields to 32 bit. To ensure all 'n' fields working,
they must all be 32 bit fields. */
/* Meanwhile, *_valid fields are 8 bit fields, and 'f'
fields are double. Rigid as they are, it is the
the status quo, until the parsing mechanism is
change, that is. */
typedef struct typedef struct
{ {
uint8_t GYRO_BIAS_RANDOM_WALK_VALID; uint8_t GYRO_BIAS_RANDOM_WALK_VALID;

5
utils/loc_cfg.cpp
View file

@ -175,8 +175,7 @@ DEPENDENCIES
N/A N/A
RETURN VALUE RETURN VALUE
0: No config or incomplete config or invalid parameter 0: Number of records in the config_table filled with input_buf
1: Filled a record
SIDE EFFECTS SIDE EFFECTS
N/A N/A
@ -220,7 +219,7 @@ int loc_fill_conf_item(char* input_buf,
for(uint32_t i = 0; NULL != config_table && i < table_length; i++) for(uint32_t i = 0; NULL != config_table && i < table_length; i++)
{ {
if(!loc_set_config_entry(&config_table[i], &config_value)) { if(!loc_set_config_entry(&config_table[i], &config_value)) {
ret = 1; ret += 1;
} }
} }
} }