Merge "SUPL Version for 5G and LPP Rel 15"

This commit is contained in:
qctecmdr 2019-11-25 10:16:18 -08:00 committed by Gerrit - the friendly Code Review server
commit 6b13ac10f1
5 changed files with 12 additions and 0 deletions

View file

@ -65,6 +65,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version) {
config.size = sizeof(GnssConfig); config.size = sizeof(GnssConfig);
config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT; config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT;
switch (version) { switch (version) {
case 0x00020004:
config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4;
break;
case 0x00020002: case 0x00020002:
config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2; config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2;
break; break;

View file

@ -65,6 +65,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version) {
config.size = sizeof(GnssConfig); config.size = sizeof(GnssConfig);
config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT; config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT;
switch (version) { switch (version) {
case 0x00020004:
config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4;
break;
case 0x00020002: case 0x00020002:
config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2; config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2;
break; break;

View file

@ -55,6 +55,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version) {
config.size = sizeof(GnssConfig); config.size = sizeof(GnssConfig);
config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT; config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT;
switch (version) { switch (version) {
case 0x00020004:
config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4;
break;
case 0x00020002: case 0x00020002:
config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2; config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2;
break; break;

View file

@ -533,6 +533,8 @@ inline uint32_t
GnssAdapter::convertSuplVersion(const GnssConfigSuplVersion suplVersion) GnssAdapter::convertSuplVersion(const GnssConfigSuplVersion suplVersion)
{ {
switch (suplVersion) { switch (suplVersion) {
case GNSS_CONFIG_SUPL_VERSION_2_0_4:
return 0x00020004;
case GNSS_CONFIG_SUPL_VERSION_2_0_0: case GNSS_CONFIG_SUPL_VERSION_2_0_0:
return 0x00020000; return 0x00020000;
case GNSS_CONFIG_SUPL_VERSION_2_0_2: case GNSS_CONFIG_SUPL_VERSION_2_0_2:

View file

@ -248,6 +248,7 @@ typedef enum {
GNSS_CONFIG_SUPL_VERSION_1_0_0 = 1, GNSS_CONFIG_SUPL_VERSION_1_0_0 = 1,
GNSS_CONFIG_SUPL_VERSION_2_0_0, GNSS_CONFIG_SUPL_VERSION_2_0_0,
GNSS_CONFIG_SUPL_VERSION_2_0_2, GNSS_CONFIG_SUPL_VERSION_2_0_2,
GNSS_CONFIG_SUPL_VERSION_2_0_4,
} GnssConfigSuplVersion; } GnssConfigSuplVersion;
// LTE Positioning Profile // LTE Positioning Profile