xiaomi-sm8450/android_device_xiaomi_sm8450-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm8450-common: gps: Add RSSI/RTT QWES and HW feature bits in ContextBase

Browse Source 
Change-Id: I2b6a7d10c367862f8bb76b6a4a5c401e32a3c96e
CRs-Fixed: 3362481
This commit is contained in:
haohuang
2022-12-08 18:44:02 +08:00
committed by Arian
parent 04153f1085
commit 58ea2a68e5
6 changed files with 183 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gps/core/ContextBase.cpp
View File

@@ -30,7 +30,7 @@
/* /*
Changes from Qualcomm Innovation Center are provided under the following license: Changes from Qualcomm Innovation Center are provided under the following license:
Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. Copyright (c) 2022, 2023 Qualcomm Innovation Center, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted (subject to the limitations in the modification, are permitted (subject to the limitations in the
@@ -88,6 +88,7 @@ bool ContextBase::sGnssMeasurementSupported = false;
uint8_t ContextBase::sFeaturesSupported[MAX_FEATURE_LENGTH]; uint8_t ContextBase::sFeaturesSupported[MAX_FEATURE_LENGTH];
GnssNMEARptRate ContextBase::sNmeaReportRate = GNSS_NMEA_REPORT_RATE_NHZ; GnssNMEARptRate ContextBase::sNmeaReportRate = GNSS_NMEA_REPORT_RATE_NHZ;
LocationCapabilitiesMask ContextBase::sQwesFeatureMask = 0; LocationCapabilitiesMask ContextBase::sQwesFeatureMask = 0;
LocationCapabilitiesMask ContextBase::sHwCapabilitiesMask = 0;
const loc_param_s_type ContextBase::mGps_conf_table[] = const loc_param_s_type ContextBase::mGps_conf_table[] =
{ {

29
gps/core/ContextBase.h
View File

@@ -30,7 +30,7 @@
/* /*
Changes from Qualcomm Innovation Center are provided under the following license: Changes from Qualcomm Innovation Center are provided under the following license:
Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. Copyright (c) 2022, 2023 Qualcomm Innovation Center, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted (subject to the limitations in the modification, are permitted (subject to the limitations in the
@@ -206,6 +206,7 @@ public:
static bool sGnssMeasurementSupported; static bool sGnssMeasurementSupported;
static GnssNMEARptRate sNmeaReportRate; static GnssNMEARptRate sNmeaReportRate;
static LocationCapabilitiesMask sQwesFeatureMask; static LocationCapabilitiesMask sQwesFeatureMask;
static LocationHwCapabilitiesMask sHwCapabilitiesMask;
void readConfig(); void readConfig();
static uint32_t getCarrierCapabilities(); static uint32_t getCarrierCapabilities();
@@ -319,6 +320,20 @@ public:
sQwesFeatureMask &= ~LOCATION_CAPABILITIES_QWES_DGNSS; sQwesFeatureMask &= ~LOCATION_CAPABILITIES_QWES_DGNSS;
} }
break; break;
case LOCATION_QWES_FEATURE_TYPE_RSSI_POSITIONING:
if (itr->second) {
sQwesFeatureMask |= LOCATION_CAPABILITIES_QWES_WIFI_RSSI_POSITIONING;
} else {
sQwesFeatureMask &= ~LOCATION_CAPABILITIES_QWES_WIFI_RSSI_POSITIONING;
}
break;
case LOCATION_QWES_FEATURE_TYPE_RTT_POSITIONING:
if (itr->second) {
sQwesFeatureMask |= LOCATION_CAPABILITIES_QWES_WIFI_RTT_POSITIONING;
} else {
sQwesFeatureMask &= ~LOCATION_CAPABILITIES_QWES_WIFI_RTT_POSITIONING;
}
break;
} }
} }
@@ -356,7 +371,19 @@ public:
return (ContextBase::sQwesFeatureMask); return (ContextBase::sQwesFeatureMask);
} }
/*
set HW feature status info
*/
static inline void setHwCapabilities(const LocationHwCapabilitiesMask& mask) {
sHwCapabilitiesMask |= mask;
}
/*
get HW feature status info
*/
static inline LocationHwCapabilitiesMask getHwCapabilitiesMask() {
return (ContextBase::sHwCapabilitiesMask);
}
}; };
struct LocApiResponse: LocMsg { struct LocApiResponse: LocMsg {

12
gps/core/LocAdapterBase.cpp
View File

@@ -30,7 +30,7 @@
/* /*
Changes from Qualcomm Innovation Center are provided under the following license: Changes from Qualcomm Innovation Center are provided under the following license:
Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. Copyright (c) 2022, 2023 Qualcomm Innovation Center, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted (subject to the limitations in the modification, are permitted (subject to the limitations in the
@@ -362,6 +362,16 @@ LocAdapterBase::getCapabilities()
if ((ContextBase::getQwesFeatureStatus() & LOCATION_CAPABILITIES_QWES_PPE)) { if ((ContextBase::getQwesFeatureStatus() & LOCATION_CAPABILITIES_QWES_PPE)) {
mask |= LOCATION_CAPABILITIES_QWES_PPE; mask |= LOCATION_CAPABILITIES_QWES_PPE;
} }
//Get QWES feature status mask
mask |= ContextBase::getQwesFeatureStatus();
//Get HW feature status mask
LocationHwCapabilitiesMask hwMask = ContextBase::getHwCapabilitiesMask();
if ((hwMask & LOCATION_WIFI_CAPABILITY_RTT) != 0) {
mask |= LOCATION_CAPABILITIES_WIFI_RTT_POSITIONING;
}
if ((hwMask & LOCATION_WIFI_CAPABILITY_RSSI) != 0) {
mask |= LOCATION_CAPABILITIES_WIFI_RSSI_POSITIONING;
}
} else { } else {
LOC_LOGE("%s]: attempt to get capabilities before they are known.", __func__); LOC_LOGE("%s]: attempt to get capabilities before they are known.", __func__);
} }

40
gps/core/LocApiBase.h
View File

@@ -26,6 +26,44 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
/*
Changes from Qualcomm Innovation Center are provided under the following license:
Copyright (c) 2022, 2023 Qualcomm Innovation Center, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted (subject to the limitations in the
disclaimer below) provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef LOC_API_BASE_H #ifndef LOC_API_BASE_H
#define LOC_API_BASE_H #define LOC_API_BASE_H
@@ -141,9 +179,9 @@ protected:
} }
bool isInSession(); bool isInSession();
const LOC_API_ADAPTER_EVENT_MASK_T mExcludedMask; const LOC_API_ADAPTER_EVENT_MASK_T mExcludedMask;
bool isMaster();
public: public:
bool isMaster();
inline void sendMsg(const LocMsg* msg) const { inline void sendMsg(const LocMsg* msg) const {
if (nullptr != mMsgTask) { if (nullptr != mMsgTask) {
mMsgTask->sendMsg(msg); mMsgTask->sendMsg(msg);

3
gps/gnss/GnssAdapter.cpp
View File

@@ -2959,9 +2959,6 @@ GnssAdapter::getCapabilities()
if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_AGPM_V02)) { if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_AGPM_V02)) {
mask |= LOCATION_CAPABILITIES_AGPM_BIT; mask |= LOCATION_CAPABILITIES_AGPM_BIT;
} }
if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_ENGINE_DEBUG_DATA)) {
mask |= LOCATION_CAPABILITIES_ENGINE_DEBUG_DATA_BIT;
}
//Get QWES feature status mask //Get QWES feature status mask
mask |= ContextBase::getQwesFeatureStatus(); mask |= ContextBase::getQwesFeatureStatus();
return mask; return mask;

180
gps/location/LocationDataTypes.h
View File

@@ -28,8 +28,7 @@
/* /*
Changes from Qualcomm Innovation Center are provided under the following license: Changes from Qualcomm Innovation Center are provided under the following license:
Copyright (c) 2022, 2023 Qualcomm Innovation Center, Inc. All rights reserved.
Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted (subject to the limitations in the modification, are permitted (subject to the limitations in the
@@ -282,81 +281,91 @@ typedef enum {
// Set of masks for Modem and QWES capabilities. // Set of masks for Modem and QWES capabilities.
typedef uint64_t LocationCapabilitiesMask; typedef uint64_t LocationCapabilitiesMask;
typedef enum { // supports startTracking API with minInterval param
// supports startTracking API with minInterval param #define LOCATION_CAPABILITIES_TIME_BASED_TRACKING_BIT (1<<0)
LOCATION_CAPABILITIES_TIME_BASED_TRACKING_BIT = (1<<0), // supports startBatching API with minInterval param
// supports startBatching API with minInterval param #define LOCATION_CAPABILITIES_TIME_BASED_BATCHING_BIT (1<<1)
LOCATION_CAPABILITIES_TIME_BASED_BATCHING_BIT = (1<<1), // supports startTracking API with minDistance param
// supports startTracking API with minDistance param #define LOCATION_CAPABILITIES_DISTANCE_BASED_TRACKING_BIT (1<<2)
LOCATION_CAPABILITIES_DISTANCE_BASED_TRACKING_BIT = (1<<2), // supports startBatching API with minDistance param
// supports startBatching API with minDistance param #define LOCATION_CAPABILITIES_DISTANCE_BASED_BATCHING_BIT (1<<3)
LOCATION_CAPABILITIES_DISTANCE_BASED_BATCHING_BIT = (1<<3), // supports addGeofences API
// supports addGeofences API #define LOCATION_CAPABILITIES_GEOFENCE_BIT (1<<4)
LOCATION_CAPABILITIES_GEOFENCE_BIT = (1<<4), // supports GnssMeasurementsCallback
// supports GnssMeasurementsCallback #define LOCATION_CAPABILITIES_GNSS_MEASUREMENTS_BIT (1<<5)
LOCATION_CAPABILITIES_GNSS_MEASUREMENTS_BIT = (1<<5), // supports startTracking/startBatching API with LocationOptions.mode of MSB (Ms Based)
// supports startTracking/startBatching API with LocationOptions.mode of MSB (Ms Based) #define LOCATION_CAPABILITIES_GNSS_MSB_BIT (1<<6)
LOCATION_CAPABILITIES_GNSS_MSB_BIT = (1<<6), // supports startTracking/startBatching API with LocationOptions.mode of MSA (MS Assisted)
// supports startTracking/startBatching API with LocationOptions.mode of MSA (MS Assisted) #define LOCATION_CAPABILITIES_GNSS_MSA_BIT (1<<7)
LOCATION_CAPABILITIES_GNSS_MSA_BIT = (1<<7), // supports debug nmea sentences in the debugNmeaCallback
// supports debug nmea sentences in the debugNmeaCallback #define LOCATION_CAPABILITIES_DEBUG_NMEA_BIT (1<<8)
LOCATION_CAPABILITIES_DEBUG_NMEA_BIT = (1<<8), // support outdoor trip batching
// support outdoor trip batching #define LOCATION_CAPABILITIES_OUTDOOR_TRIP_BATCHING_BIT (1<<9)
LOCATION_CAPABILITIES_OUTDOOR_TRIP_BATCHING_BIT = (1<<9), // support constellation enablement
// support constellation enablement #define LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT (1<<10)
LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT = (1<<10), // support agpm
// support agpm #define LOCATION_CAPABILITIES_AGPM_BIT (1<<11)
LOCATION_CAPABILITIES_AGPM_BIT = (1<<11), // support location privacy
// support location privacy #define LOCATION_CAPABILITIES_PRIVACY_BIT (1<<12)
LOCATION_CAPABILITIES_PRIVACY_BIT = (1<<12), // support measurement corrections
// support measurement corrections #define LOCATION_CAPABILITIES_MEASUREMENTS_CORRECTION_BIT (1<<13)
LOCATION_CAPABILITIES_MEASUREMENTS_CORRECTION_BIT = (1<<13), // support Robust Location
// support Robust Location #define LOCATION_CAPABILITIES_CONFORMITY_INDEX_BIT (1<<14)
LOCATION_CAPABILITIES_CONFORMITY_INDEX_BIT = (1<<14), // support precise location edgnss
// support precise location edgnss #define LOCATION_CAPABILITIES_EDGNSS_BIT (1<<15)
LOCATION_CAPABILITIES_EDGNSS_BIT = (1<<15), // Modem supports Carrier Phase for Precise Positioning
// Modem supports Carrier Phase for Precise Positioning // Measurement Engine (PPME).
// Measurement Engine (PPME). #define LOCATION_CAPABILITIES_QWES_CARRIER_PHASE_BIT (1<<16)
LOCATION_CAPABILITIES_QWES_CARRIER_PHASE_BIT = (1<<16), // Modem supports SV Polynomial for tightly coupled external
// Modem supports SV Polynomial for tightly coupled external // DR support. This is a Standalone Feature.
// DR support. This is a Standalone Feature. #define LOCATION_CAPABILITIES_QWES_SV_POLYNOMIAL_BIT (1<<17)
LOCATION_CAPABILITIES_QWES_SV_POLYNOMIAL_BIT = (1<<17), // Modem supports SV Ephemeris for tightly coupled external
// Modem supports SV Ephemeris for tightly coupled external // PPE engines. This is a Standalone Feature.
// PPE engines. This is a Standalone Feature. #define LOCATION_CAPABILITIES_QWES_SV_EPHEMERIS_BIT (1<<18)
LOCATION_CAPABILITIES_QWES_SV_EPHEMERIS_BIT = (1<<18), // Modem supports GNSS Single Frequency feature. This is a
// Modem supports GNSS Single Frequency feature. This is a // Standalone Feature.
// Standalone Feature. #define LOCATION_CAPABILITIES_QWES_GNSS_SINGLE_FREQUENCY (1<<19)
LOCATION_CAPABILITIES_QWES_GNSS_SINGLE_FREQUENCY = (1<<19), // Modem supports GNSS Multi Frequency feature. Multi Frequency
// Modem supports GNSS Multi Frequency feature. Multi Frequency // enables Single frequency also.
// enables Single frequency also. #define LOCATION_CAPABILITIES_QWES_GNSS_MULTI_FREQUENCY (1<<20)
LOCATION_CAPABILITIES_QWES_GNSS_MULTI_FREQUENCY = (1<<20), // This mask indicates VPe license bundle is enabled. VEPP
// This mask indicates VPe license bundle is enabled. VEPP // bundle include Carrier Phase and SV Polynomial features.
// bundle include Carrier Phase and SV Polynomial features. #define LOCATION_CAPABILITIES_QWES_VPE (1<<21)
LOCATION_CAPABILITIES_QWES_VPE = (1<<21), // This mask indicates support for CV2X Location basic features.
// This mask indicates support for CV2X Location basic features. // This bundle includes features for GTS Time & Freq, C-TUNC
// This bundle includes features for GTS Time & Freq, C-TUNC // (Constrained Time uncertainity.
// (Constrained Time uncertainity. #define LOCATION_CAPABILITIES_QWES_CV2X_LOCATION_BASIC (1<<22)
LOCATION_CAPABILITIES_QWES_CV2X_LOCATION_BASIC = (1<<22), // This mask indicates support for CV2X Location premium features.
// This mask indicates support for CV2X Location premium features. // This bundle includes features for CV2X Location Basic features,
// This bundle includes features for CV2X Location Basic features, // QDR3 feature, and PACE. (Position Assisted Clock Estimator.
// QDR3 feature, and PACE. (Position Assisted Clock Estimator. #define LOCATION_CAPABILITIES_QWES_CV2X_LOCATION_PREMIUM (1<<23)
LOCATION_CAPABILITIES_QWES_CV2X_LOCATION_PREMIUM = (1<<23), // This mask indicates that PPE (Precise Positioning Engine)
// This mask indicates that PPE (Precise Positioning Engine) // library is enabled or Precise Positioning Framework (PPF)
// library is enabled or Precise Positioning Framework (PPF) // is available. This bundle includes features for Carrier
// is available. This bundle includes features for Carrier // Phase and SV Ephermeris.
// Phase and SV Ephermeris. #define LOCATION_CAPABILITIES_QWES_PPE (1<<24)
LOCATION_CAPABILITIES_QWES_PPE = (1<<24), // This mask indicates QDR2_C license bundle is enabled. This
// This mask indicates QDR2_C license bundle is enabled. This // bundle includes features for SV Polynomial.
// bundle includes features for SV Polynomial. #define LOCATION_CAPABILITIES_QWES_QDR2 (1<<25)
LOCATION_CAPABILITIES_QWES_QDR2 = (1<<25), // This mask indicates QDR3_C license bundle is enabled. This
// This mask indicates QDR3_C license bundle is enabled. This // bundle includes features for SV Polynomial.
// bundle includes features for SV Polynomial. #define LOCATION_CAPABILITIES_QWES_QDR3 (1<<26)
LOCATION_CAPABILITIES_QWES_QDR3 = (1<<26), // This mask indicates DGNSS license bundle is enabled.
// This mask indicates DGNSS license bundle is enabled. #define LOCATION_CAPABILITIES_QWES_DGNSS (1<<27)
LOCATION_CAPABILITIES_QWES_DGNSS = (1<<27), // This mask indicates Antenna info is enabled.
// This mask indicates engine debug data enabled. #define LOCATION_CAPABILITIES_ANTENNA_INFO (1<<28)
LOCATION_CAPABILITIES_ENGINE_DEBUG_DATA_BIT = (1<<28) // This mask indicates qppe or qfe library is presented.
} LocationCapabilitiesBits; #define LOCATION_CAPABILITIES_PRECISE_LIB_PRESENT (1<<29)
// This mask indicates wifi RSSI positioning is
// enabled by QWES license.
#define LOCATION_CAPABILITIES_QWES_WIFI_RSSI_POSITIONING (1ULL<<30)
// This mask indicates wifi RTT positioning is
// enabled by QWES license.
#define LOCATION_CAPABILITIES_QWES_WIFI_RTT_POSITIONING (1ULL<<31)
// This mask indicates wifi RSSI positioning is supported.
#define LOCATION_CAPABILITIES_WIFI_RSSI_POSITIONING (1ULL<<32)
// This mask indicates wifi RTT positioning is supported.
#define LOCATION_CAPABILITIES_WIFI_RTT_POSITIONING (1ULL<<33)
typedef uint8_t LocationQwesFeatureType; typedef uint8_t LocationQwesFeatureType;
typedef enum { typedef enum {
@@ -397,10 +406,27 @@ typedef enum {
LOCATION_QWES_FEATURE_TYPE_VPE, LOCATION_QWES_FEATURE_TYPE_VPE,
// This indicates DGNSS license is enabled. // This indicates DGNSS license is enabled.
LOCATION_QWES_FEATURE_TYPE_DGNSS, LOCATION_QWES_FEATURE_TYPE_DGNSS,
// This indicates DLP feature is enabled by QESDK APP
// license
LOCATION_QWES_FEATURE_TYPE_DLP_QESDK,
// This indicates wifi RSSI positioning is
// enabled by QWES license.
LOCATION_QWES_FEATURE_TYPE_RSSI_POSITIONING,
// This indicates wifi RTT positioning is
// enabled by QWES license.
LOCATION_QWES_FEATURE_TYPE_RTT_POSITIONING,
// Max value // Max value
LOCATION_QWES_FEATURE_TYPE_MAX LOCATION_QWES_FEATURE_TYPE_MAX
} LocationQwesFeatureTypes; } LocationQwesFeatureTypes;
typedef uint64_t LocationHwCapabilitiesMask;
typedef enum {
// This indicates wifi HW has RSSI capability.
LOCATION_WIFI_CAPABILITY_RSSI = (1<<0),
// This indicates wifi HW has RTT capability.
LOCATION_WIFI_CAPABILITY_RTT = (1<<1)
} LocationHwCapabilitiesBits;
typedef enum { typedef enum {
LOCATION_TECHNOLOGY_TYPE_GNSS = 0, LOCATION_TECHNOLOGY_TYPE_GNSS = 0,
} LocationTechnologyType; } LocationTechnologyType;