From 0ee43f37bbcfdf4b54c2d29a1b88e80b7e2e56cc Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Tue, 16 Jul 2024 13:06:47 +0800 Subject: [PATCH 1/2] gps: update gps version 4.15.1_18_240716_R2_227931 Bug: 346872594 Test: b/353412628 atest CtsLocationGnssTestCases atest VtsHalGnssTargetTest Change-Id: I1f12f0b25733418bb9bacc46f8b1e3c75ef2a21b --- location/gps.cfg | 21 +++++++++++++++------ location/gps_user.cfg | 15 ++++++++++----- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/location/gps.cfg b/location/gps.cfg index 089b711..c801b4c 100644 --- a/location/gps.cfg +++ b/location/gps.cfg @@ -106,11 +106,15 @@ Chip_Configuration_WatchdogPeriod = 0 Chip_Configuration_GNSSConstConstraintDef=0x602F Chip_Configuration_RfMiscCtrl=0x80008001 -# Disable BDS in the U.S. -bdsUsedInUSPolicy=2 -sbasUsedInUSPolicy=2 -qzssUsedInUSPolicy=2 -navicUsedInUSPolicy=2 +# Certain constellation permission overriding LocTech config setting: only to possibly +# disallow constellations allowed in LocTech, not vice versa. Note: GPS and GAL are +# allowed in all markets so no such overriding. +# 0: not to override (default), 1-disabled, 2- disabled if in US +#gloUsedPolicy=2 +bdsUsedPolicy=2 +sbasUsedPolicy=2 +qzssUsedPolicy=2 +navicUsedPolicy=2 # DVS: 0 = Disabled (default), 1 = Enabled # DFS: 0 = Disabled (default), 1 = Enabled @@ -159,7 +163,9 @@ Chip_Configuration_FeatureCfg_ACT = 5 ChipCfg_DspMemdumpEnable=1 -Agnss_IsGloAidingEnable=0 +Agnss_IsGloAidingEnable=1 +Agnss_IsGalAidingEnable=1 +Agnss_IsBdsAidingEnable=1 Agnss_SuplUseCpNi=1 Agnss_SuplAidIntvlCrossSess=1 SETCaps_IsOtdoa=1 @@ -227,8 +233,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 # ATT GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 # TMO GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/gps_user.cfg b/location/gps_user.cfg index fabc19f..36180f1 100644 --- a/location/gps_user.cfg +++ b/location/gps_user.cfg @@ -31,10 +31,10 @@ spam_dog_ms=0 Chip_Configuration_WatchdogPeriod = 0 Chip_Configuration_GNSSConstConstraintDef=0x602F Chip_Configuration_RfMiscCtrl=0x80008001 -bdsUsedInUSPolicy=2 -sbasUsedInUSPolicy=2 -qzssUsedInUSPolicy=2 -navicUsedInUSPolicy=2 +bdsUsedPolicy=2 +sbasUsedPolicy=2 +qzssUsedPolicy=2 +navicUsedPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_MTPL=0 @@ -46,7 +46,9 @@ additional_rtc_uncertainty_ms=10 Sif_UseFwXtraInterface=1 Chip_Configuration_FeatureCfg_ACT = 5 ChipCfg_DspMemdumpEnable=1 -Agnss_IsGloAidingEnable=0 +Agnss_IsGloAidingEnable=1 +Agnss_IsGalAidingEnable=1 +Agnss_IsBdsAidingEnable=1 Agnss_SuplUseCpNi=1 Agnss_SuplAidIntvlCrossSess=1 SETCaps_IsOtdoa=1 @@ -106,7 +108,10 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 ENABLE_4G_CP_CAPS_MSA=0 From 00a7959ec93b7959a0aad69e4c86068c2a109191 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Thu, 25 Jul 2024 11:46:02 +0800 Subject: [PATCH 2/2] gps: enable MTPL Bug: 334722223 Test: MTPL working fine b/334722223#comment109 Change-Id: I40fc3d69ea7ebf2e08eb9df509b7ca8beb6ac261 --- location/gps.cfg | 2 +- location/gps_user.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/location/gps.cfg b/location/gps.cfg index 089b711..30c0887 100644 --- a/location/gps.cfg +++ b/location/gps.cfg @@ -117,7 +117,7 @@ navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 # MTPL: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_MTPL=0 +Chip_Configuration_FeatureCfg_MTPL=1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/location/gps_user.cfg b/location/gps_user.cfg index fabc19f..8bb972b 100644 --- a/location/gps_user.cfg +++ b/location/gps_user.cfg @@ -37,7 +37,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 -Chip_Configuration_FeatureCfg_MTPL=0 +Chip_Configuration_FeatureCfg_MTPL=1 mailboxDisabled=0x0 gnss_rfic_chip_id=55200001 UseRtcForAiding=1