From 1a305b52c1b125f359f5dc295fb9983322d91be2 Mon Sep 17 00:00:00 2001 From: nyyu Date: Sat, 26 Nov 2022 19:46:02 +0100 Subject: [PATCH] msm8974-common: Adapt GPS hal to S --- gps/loc_api/libloc_api_50001/loc_eng.cpp | 18 +++++++++--------- gps/loc_api/libloc_api_50001/loc_eng.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gps/loc_api/libloc_api_50001/loc_eng.cpp b/gps/loc_api/libloc_api_50001/loc_eng.cpp index e70ae23..812d5a8 100644 --- a/gps/loc_api/libloc_api_50001/loc_eng.cpp +++ b/gps/loc_api/libloc_api_50001/loc_eng.cpp @@ -108,9 +108,9 @@ static const loc_param_s_type gps_conf_table[] = {"NMEA_PROVIDER", &gps_conf.NMEA_PROVIDER, NULL, 'n'}, {"CAPABILITIES", &gps_conf.CAPABILITIES, NULL, 'n'}, {"XTRA_VERSION_CHECK", &gps_conf.XTRA_VERSION_CHECK, NULL, 'n'}, - {"XTRA_SERVER_1", &gps_conf.XTRA_SERVER_1, NULL, 's'}, - {"XTRA_SERVER_2", &gps_conf.XTRA_SERVER_2, NULL, 's'}, - {"XTRA_SERVER_3", &gps_conf.XTRA_SERVER_3, NULL, 's'}, + {"LONGTERM_PSDS_SERVER_1", &gps_conf.LONGTERM_PSDS_SERVER_1, NULL, 's'}, + {"LONGTERM_PSDS_SERVER_2", &gps_conf.LONGTERM_PSDS_SERVER_2, 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'}, }; @@ -928,14 +928,14 @@ LocEngReportXtraServer::LocEngReportXtraServer(void* locEng, memset(mServers, 0, 3*(mMaxLen+1)); // Override modem URLs with uncommented gps.conf urls - if( gps_conf.XTRA_SERVER_1[0] != '\0' ) { - url1 = &gps_conf.XTRA_SERVER_1[0]; + if( gps_conf.LONGTERM_PSDS_SERVER_1[0] != '\0' ) { + url1 = &gps_conf.LONGTERM_PSDS_SERVER_1[0]; } - if( gps_conf.XTRA_SERVER_2[0] != '\0' ) { - url2 = &gps_conf.XTRA_SERVER_2[0]; + if( gps_conf.LONGTERM_PSDS_SERVER_2[0] != '\0' ) { + url2 = &gps_conf.LONGTERM_PSDS_SERVER_2[0]; } - if( gps_conf.XTRA_SERVER_3[0] != '\0' ) { - url3 = &gps_conf.XTRA_SERVER_3[0]; + if( gps_conf.LONGTERM_PSDS_SERVER_3[0] != '\0' ) { + url3 = &gps_conf.LONGTERM_PSDS_SERVER_3[0]; } // copy non xtra1.gpsonextra.net URLs into the forwarding buffer. if( NULL == strcasestr(url1, XTRA1_GPSONEXTRA) ) { diff --git a/gps/loc_api/libloc_api_50001/loc_eng.h b/gps/loc_api/libloc_api_50001/loc_eng.h index 59e6c14..c07528d 100644 --- a/gps/loc_api/libloc_api_50001/loc_eng.h +++ b/gps/loc_api/libloc_api_50001/loc_eng.h @@ -154,9 +154,9 @@ typedef struct loc_gps_cfg_s uint32_t CAPABILITIES; uint32_t LPP_PROFILE; uint32_t XTRA_VERSION_CHECK; - char XTRA_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH]; - char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH]; - char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH]; + char LONGTERM_PSDS_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH]; + char LONGTERM_PSDS_SERVER_2[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 NMEA_PROVIDER; uint32_t GPS_LOCK;