diff options
author | Deven Patel <cdevenp@codeaurora.org> | 2016-03-07 10:44:34 -0800 |
---|---|---|
committer | Deven Patel <cdevenp@codeaurora.org> | 2016-03-07 10:55:20 -0800 |
commit | a29688ff347be4972133eb11ccecaf03b0d3445e (patch) | |
tree | 45dc8adb0d08a30bc542075042884cef831bcfdf /core/LocApiBase.h | |
parent | fa7a874eb0586c7844fe3a4cb8d0063ce53464f0 (diff) | |
download | gps-a29688ff347be4972133eb11ccecaf03b0d3445e.tar.gz |
Revert "Merging m_master changes to oe_master".
This reverts commit 1aeb6bad84c0afd0e032c3d4d7e33959501e18f1
Change-Id: Iec0a96e7cdfe55ef5836c92a2ae1cce407f6cd5e
Diffstat (limited to 'core/LocApiBase.h')
-rw-r--r-- | core/LocApiBase.h | 60 |
1 files changed, 9 insertions, 51 deletions
diff --git a/core/LocApiBase.h b/core/LocApiBase.h index 5a2c56f..c48927c 100644 --- a/core/LocApiBase.h +++ b/core/LocApiBase.h @@ -36,7 +36,6 @@ #include <platform_lib_log_util.h> namespace loc_core { -class ContextBase; int hexcode(char *hexstring, int string_size, const char *data, int data_size); @@ -53,13 +52,6 @@ int decodeAddress(char *addr_string, int string_size, #define TO_1ST_HANDLING_ADAPTER(adapters, call) \ for (int i = 0; i <MAX_ADAPTERS && NULL != (adapters)[i] && !(call); i++); -enum xtra_version_check { - DISABLED, - AUTO, - XTRA2, - XTRA3 -}; - class LocAdapterBase; struct LocSsrMsg; struct LocOpenMsg; @@ -78,9 +70,8 @@ class LocApiBase { friend struct LocOpenMsg; friend class ContextBase; const MsgTask* mMsgTask; - ContextBase *mContext; + LocAdapterBase* mLocAdapters[MAX_ADAPTERS]; - uint64_t mSupportedMsg; protected: virtual enum loc_api_adapter_err @@ -90,17 +81,12 @@ protected: LOC_API_ADAPTER_EVENT_MASK_T getEvtMask(); LOC_API_ADAPTER_EVENT_MASK_T mMask; LocApiBase(const MsgTask* msgTask, - LOC_API_ADAPTER_EVENT_MASK_T excludedMask, - ContextBase* context = NULL); + LOC_API_ADAPTER_EVENT_MASK_T excludedMask); inline virtual ~LocApiBase() { close(); } bool isInSession(); const LOC_API_ADAPTER_EVENT_MASK_T mExcludedMask; public: - inline void sendMsg(const LocMsg* msg) const { - mMsgTask->sendMsg(msg); - } - void addAdapter(LocAdapterBase* adapter); void removeAdapter(LocAdapterBase* adapter); @@ -113,7 +99,7 @@ public: enum loc_sess_status status, LocPosTechMask loc_technology_mask = LOC_POS_TECH_MASK_DEFAULT); - void reportSv(GnssSvStatus &svStatus, + void reportSv(GpsSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt); void reportStatus(GpsStatusValue status); @@ -129,8 +115,6 @@ public: void reportDataCallOpened(); void reportDataCallClosed(); void requestNiNotify(GpsNiNotification ¬ify, const void* data); - void saveSupportedMsgList(uint64_t supportedMsgList); - void reportGpsMeasurementData(GpsData &gpsMeasurementData); // downward calls // All below functions are to be defined by adapter specific modules: @@ -174,7 +158,7 @@ public: virtual enum loc_api_adapter_err setLPPConfig(uint32_t profile); virtual enum loc_api_adapter_err - setSensorControlConfig(int sensorUsage, int sensorProvider); + setSensorControlConfig(int sensorUsage); virtual enum loc_api_adapter_err setSensorProperties(bool gyroBiasVarianceRandomWalk_valid, float gyroBiasVarianceRandomWalk, @@ -202,28 +186,15 @@ public: virtual enum loc_api_adapter_err setAGLONASSProtocol(unsigned long aGlonassProtocol); virtual enum loc_api_adapter_err - getWwanZppFix(GpsLocation & zppLoc); - virtual enum loc_api_adapter_err - getBestAvailableZppFix(GpsLocation & zppLoc); + getZppFix(GpsLocation & zppLoc); virtual enum loc_api_adapter_err - getBestAvailableZppFix(GpsLocation & zppLoc, LocPosTechMask & tech_mask); + getZppFix(GpsLocation & zppLoc, LocPosTechMask & tech_mask); virtual int initDataServiceClient(); virtual int openAndStartDataCall(); virtual void stopDataCall(); virtual void closeDataCall(); - virtual void installAGpsCert(const DerEncodedCertificate* pData, - size_t length, - uint32_t slotBitMask); + inline virtual void setInSession(bool inSession) {} - inline bool isMessageSupported (LocCheckingMessagesID msgID) const { - if (msgID > (sizeof(mSupportedMsg) << 3)) { - return false; - } else { - uint32_t messageChecker = 1 << msgID; - return (messageChecker & mSupportedMsg) == messageChecker; - } - } - void updateEvtMask(); /*Values for lock 1 = Do not lock any position sessions @@ -231,30 +202,17 @@ public: 3 = Lock MT position sessions 4 = Lock all position sessions */ - virtual int setGpsLock(LOC_GPS_LOCK_MASK lock); + virtual int setGpsLock(unsigned int lock); /* Returns Current value of GPS Lock on success -1 on failure */ virtual int getGpsLock(void); - - virtual enum loc_api_adapter_err setXtraVersionCheck(enum xtra_version_check check); - - /* - Update gps reporting events - */ - virtual int updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event, - loc_registration_mask_status isEnabled); - /* - Check if the modem support the service - */ - virtual bool gnssConstellationConfig(); }; typedef LocApiBase* (getLocApi_t)(const MsgTask* msgTask, - LOC_API_ADAPTER_EVENT_MASK_T exMask, - ContextBase *context); + LOC_API_ADAPTER_EVENT_MASK_T exMask); } // namespace loc_core |