tequilaOS/platform_device_xiaomi_sm8450-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sm8450-common: gps: Remove getCapablities impl from gnss adapter

Browse source 
getCapablities impl is moved to LocAdapterBase
class as for QWES unify. All the adapters should use the
same implementation.

CRs-fixed: 3609221
Change-Id: I0e9f7af1437af47f20e27a9bad94231c594753c7
This commit is contained in:
Nilesh Gharde 2023-09-06 22:35:28 -07:00 committed by Arian
parent 5e81e4bd4c
commit 1a74532ea6
4 changed files with 11 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gps/core/LocAdapterBase.cpp
View file

@ -362,6 +362,9 @@ 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;
} }
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();
//Get HW feature status mask //Get HW feature status mask

42
gps/gnss/GnssAdapter.cpp
View file

@ -2922,48 +2922,6 @@ void GnssAdapter::checkAndRestartTimeBasedSession()
} }
} }
LocationCapabilitiesMask
GnssAdapter::getCapabilities()
{
LocationCapabilitiesMask mask = 0;
uint32_t carrierCapabilities = ContextBase::getCarrierCapabilities();
// time based tracking always supported
mask |= LOCATION_CAPABILITIES_TIME_BASED_TRACKING_BIT;
// geofence always supported
mask |= LOCATION_CAPABILITIES_GEOFENCE_BIT;
if (carrierCapabilities & LOC_GPS_CAPABILITY_MSB) {
mask |= LOCATION_CAPABILITIES_GNSS_MSB_BIT;
}
if (LOC_GPS_CAPABILITY_MSA & carrierCapabilities) {
mask |= LOCATION_CAPABILITIES_GNSS_MSA_BIT;
}
if (ContextBase::isMessageSupported(LOC_API_ADAPTER_MESSAGE_DISTANCE_BASE_LOCATION_BATCHING)) {
mask |= LOCATION_CAPABILITIES_TIME_BASED_BATCHING_BIT |
LOCATION_CAPABILITIES_DISTANCE_BASED_BATCHING_BIT;
}
if (ContextBase::isMessageSupported(LOC_API_ADAPTER_MESSAGE_DISTANCE_BASE_TRACKING)) {
mask |= LOCATION_CAPABILITIES_DISTANCE_BASED_TRACKING_BIT;
}
if (ContextBase::isMessageSupported(LOC_API_ADAPTER_MESSAGE_OUTDOOR_TRIP_BATCHING)) {
mask |= LOCATION_CAPABILITIES_OUTDOOR_TRIP_BATCHING_BIT;
}
if (ContextBase::gnssConstellationConfig()) {
mask |= LOCATION_CAPABILITIES_GNSS_MEASUREMENTS_BIT;
}
if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_DEBUG_NMEA_V02)) {
mask |= LOCATION_CAPABILITIES_DEBUG_NMEA_BIT;
}
if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_CONSTELLATION_ENABLEMENT_V02)) {
mask |= LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT;
}
if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_AGPM_V02)) {
mask |= LOCATION_CAPABILITIES_AGPM_BIT;
}
//Get QWES feature status mask
mask |= ContextBase::getQwesFeatureStatus();
return mask;
}
void void
GnssAdapter::notifyClientOfCachedLocationSystemInfo( GnssAdapter::notifyClientOfCachedLocationSystemInfo(
LocationAPI* client, const LocationCallbacks& callbacks) { LocationAPI* client, const LocationCallbacks& callbacks) {

1
gps/gnss/GnssAdapter.h
View file

@ -715,7 +715,6 @@ public:
void setSuplHostServer(const char* server, int port, LocServerType type); void setSuplHostServer(const char* server, int port, LocServerType type);
void notifyClientOfCachedLocationSystemInfo(LocationAPI* client, void notifyClientOfCachedLocationSystemInfo(LocationAPI* client,
const LocationCallbacks& callbacks); const LocationCallbacks& callbacks);
LocationCapabilitiesMask getCapabilities();
void updateSystemPowerStateCommand(PowerStateType systemPowerState); void updateSystemPowerStateCommand(PowerStateType systemPowerState);
/*==== DGnss Usable Report Flag ====================================================*/ /*==== DGnss Usable Report Flag ====================================================*/

14
gps/location/LocationDataTypes.h
View file

@ -352,20 +352,22 @@ typedef uint64_t LocationCapabilitiesMask;
#define LOCATION_CAPABILITIES_QWES_QDR3 (1<<26) #define 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) #define LOCATION_CAPABILITIES_QWES_DGNSS (1<<27)
// This mask indicates engine debug data enabled.
#define LOCATION_CAPABILITIES_ENGINE_DEBUG_DATA_BIT (1<<28)
// This mask indicates Antenna info is enabled. // This mask indicates Antenna info is enabled.
#define LOCATION_CAPABILITIES_ANTENNA_INFO (1<<28) #define LOCATION_CAPABILITIES_ANTENNA_INFO (1<<29)
// This mask indicates qppe or qfe library is presented. // This mask indicates qppe or qfe library is presented.
#define LOCATION_CAPABILITIES_PRECISE_LIB_PRESENT (1<<29) #define LOCATION_CAPABILITIES_PRECISE_LIB_PRESENT (1<<30)
// This mask indicates wifi RSSI positioning is // This mask indicates wifi RSSI positioning is
// enabled by QWES license. // enabled by QWES license.
#define LOCATION_CAPABILITIES_QWES_WIFI_RSSI_POSITIONING (1ULL<<30) #define LOCATION_CAPABILITIES_QWES_WIFI_RSSI_POSITIONING (1ULL<<31)
// This mask indicates wifi RTT positioning is // This mask indicates wifi RTT positioning is
// enabled by QWES license. // enabled by QWES license.
#define LOCATION_CAPABILITIES_QWES_WIFI_RTT_POSITIONING (1ULL<<31) #define LOCATION_CAPABILITIES_QWES_WIFI_RTT_POSITIONING (1ULL<<32)
// This mask indicates wifi RSSI positioning is supported. // This mask indicates wifi RSSI positioning is supported.
#define LOCATION_CAPABILITIES_WIFI_RSSI_POSITIONING (1ULL<<32) #define LOCATION_CAPABILITIES_WIFI_RSSI_POSITIONING (1ULL<<33)
// This mask indicates wifi RTT positioning is supported. // This mask indicates wifi RTT positioning is supported.
#define LOCATION_CAPABILITIES_WIFI_RTT_POSITIONING (1ULL<<33) #define LOCATION_CAPABILITIES_WIFI_RTT_POSITIONING (1ULL<<34)
typedef uint8_t LocationQwesFeatureType; typedef uint8_t LocationQwesFeatureType;
typedef enum { typedef enum {