msm8974-common: Adapt GPS hal to S

This commit is contained in:
nyyu 2022-11-26 19:46:02 +01:00
parent c1c2ca26da
commit 1a305b52c1
2 changed files with 12 additions and 12 deletions

View File

@ -108,9 +108,9 @@ static const loc_param_s_type gps_conf_table[] =
{"NMEA_PROVIDER", &gps_conf.NMEA_PROVIDER, NULL, 'n'}, {"NMEA_PROVIDER", &gps_conf.NMEA_PROVIDER, NULL, 'n'},
{"CAPABILITIES", &gps_conf.CAPABILITIES, NULL, 'n'}, {"CAPABILITIES", &gps_conf.CAPABILITIES, NULL, 'n'},
{"XTRA_VERSION_CHECK", &gps_conf.XTRA_VERSION_CHECK, NULL, 'n'}, {"XTRA_VERSION_CHECK", &gps_conf.XTRA_VERSION_CHECK, NULL, 'n'},
{"XTRA_SERVER_1", &gps_conf.XTRA_SERVER_1, NULL, 's'}, {"LONGTERM_PSDS_SERVER_1", &gps_conf.LONGTERM_PSDS_SERVER_1, NULL, 's'},
{"XTRA_SERVER_2", &gps_conf.XTRA_SERVER_2, NULL, 's'}, {"LONGTERM_PSDS_SERVER_2", &gps_conf.LONGTERM_PSDS_SERVER_2, NULL, 's'},
{"XTRA_SERVER_3", &gps_conf.XTRA_SERVER_3, NULL, 's'}, {"LONGTERM_PSDS_SERVER_3", &gps_conf.LONGTERM_PSDS_SERVER_3, NULL, 's'},
{"USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL", &gps_conf.USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL, NULL, 'n'}, {"USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL", &gps_conf.USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL, NULL, 'n'},
}; };
@ -928,14 +928,14 @@ LocEngReportXtraServer::LocEngReportXtraServer(void* locEng,
memset(mServers, 0, 3*(mMaxLen+1)); memset(mServers, 0, 3*(mMaxLen+1));
// Override modem URLs with uncommented gps.conf urls // Override modem URLs with uncommented gps.conf urls
if( gps_conf.XTRA_SERVER_1[0] != '\0' ) { if( gps_conf.LONGTERM_PSDS_SERVER_1[0] != '\0' ) {
url1 = &gps_conf.XTRA_SERVER_1[0]; url1 = &gps_conf.LONGTERM_PSDS_SERVER_1[0];
} }
if( gps_conf.XTRA_SERVER_2[0] != '\0' ) { if( gps_conf.LONGTERM_PSDS_SERVER_2[0] != '\0' ) {
url2 = &gps_conf.XTRA_SERVER_2[0]; url2 = &gps_conf.LONGTERM_PSDS_SERVER_2[0];
} }
if( gps_conf.XTRA_SERVER_3[0] != '\0' ) { if( gps_conf.LONGTERM_PSDS_SERVER_3[0] != '\0' ) {
url3 = &gps_conf.XTRA_SERVER_3[0]; url3 = &gps_conf.LONGTERM_PSDS_SERVER_3[0];
} }
// copy non xtra1.gpsonextra.net URLs into the forwarding buffer. // copy non xtra1.gpsonextra.net URLs into the forwarding buffer.
if( NULL == strcasestr(url1, XTRA1_GPSONEXTRA) ) { if( NULL == strcasestr(url1, XTRA1_GPSONEXTRA) ) {

View File

@ -154,9 +154,9 @@ typedef struct loc_gps_cfg_s
uint32_t CAPABILITIES; uint32_t CAPABILITIES;
uint32_t LPP_PROFILE; uint32_t LPP_PROFILE;
uint32_t XTRA_VERSION_CHECK; uint32_t XTRA_VERSION_CHECK;
char XTRA_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH]; char LONGTERM_PSDS_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH];
char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH]; char LONGTERM_PSDS_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH];
char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH]; char LONGTERM_PSDS_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; uint32_t NMEA_PROVIDER;
uint32_t GPS_LOCK; uint32_t GPS_LOCK;