From 1839fb1140242da10a6a599e65a7b79836007517 Mon Sep 17 00:00:00 2001 From: Hoss Zhou Date: Thu, 20 Dec 2018 15:05:08 +0800 Subject: [PATCH] clear magic number for GPS_LOCK Change-Id: I3c1b5a18ab16382a436098f8af541bf7f125783e CRs-fixed: 2370451 --- core/ContextBase.cpp | 2 +- core/ContextBase.h | 2 +- gnss/GnssAdapter.cpp | 44 +++++-------------------------- gnss/GnssAdapter.h | 2 -- gnss/XtraSystemStatusObserver.cpp | 2 +- gnss/XtraSystemStatusObserver.h | 4 +-- location/LocationDataTypes.h | 5 ++-- 7 files changed, 15 insertions(+), 46 deletions(-) diff --git a/core/ContextBase.cpp b/core/ContextBase.cpp index 3d55e1ca..28109bb0 100644 --- a/core/ContextBase.cpp +++ b/core/ContextBase.cpp @@ -108,7 +108,7 @@ void ContextBase::readConfig() mGps_conf.INTERMEDIATE_POS = 0; mGps_conf.ACCURACY_THRES = 0; mGps_conf.NMEA_PROVIDER = 0; - mGps_conf.GPS_LOCK = 0x03; + mGps_conf.GPS_LOCK = GNSS_CONFIG_GPS_LOCK_MO_AND_NI; mGps_conf.SUPL_VER = 0x10000; mGps_conf.SUPL_MODE = 0x1; mGps_conf.SUPL_ES = 0; diff --git a/core/ContextBase.h b/core/ContextBase.h index 8a3d3000..9c728354 100644 --- a/core/ContextBase.h +++ b/core/ContextBase.h @@ -55,7 +55,7 @@ typedef struct loc_gps_cfg_s char XTRA_SERVER_3[LOC_MAX_PARAM_STRING]; uint32_t USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL; uint32_t NMEA_PROVIDER; - uint32_t GPS_LOCK; + GnssConfigGpsLock GPS_LOCK; uint32_t A_GLONASS_POS_PROTOCOL_SELECT; uint32_t AGPS_CERT_WRITABLE_MASK; uint32_t AGPS_CONFIG_INJECT; diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index fe02db13..eee55e37 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -428,37 +428,7 @@ GnssAdapter::convertLocationInfo(GnssLocationInfoNotification& out, } } -inline uint32_t -GnssAdapter::convertGpsLock(const GnssConfigGpsLock gpsLock) -{ - switch (gpsLock) { - case GNSS_CONFIG_GPS_LOCK_MO: - return 1; - case GNSS_CONFIG_GPS_LOCK_NI: - return 2; - case GNSS_CONFIG_GPS_LOCK_MO_AND_NI: - return 3; - case GNSS_CONFIG_GPS_LOCK_NONE: - default: - return 0; - } -} -inline GnssConfigGpsLock -GnssAdapter::convertGpsLock(const uint32_t gpsLock) -{ - switch (gpsLock) { - case 1: - return GNSS_CONFIG_GPS_LOCK_MO; - case 2: - return GNSS_CONFIG_GPS_LOCK_NI; - case 3: - return GNSS_CONFIG_GPS_LOCK_MO_AND_NI; - case 0: - default: - return GNSS_CONFIG_GPS_LOCK_NONE; - } -} inline uint32_t GnssAdapter::convertSuplVersion(const GnssConfigSuplVersion suplVersion) @@ -689,7 +659,7 @@ GnssAdapter::setConfigCommand() GNSS_CONFIG_FLAGS_BLACKLISTED_SV_IDS_BIT; gnssConfigRequested.gpsLock = GNSS_CONFIG_GPS_LOCK_NONE; if (0 == adapter.getPowerVoteId()) { - gnssConfigRequested.gpsLock = adapter.convertGpsLock(gpsConf.GPS_LOCK); + gnssConfigRequested.gpsLock = gpsConf.GPS_LOCK; } if (gpsConf.AGPS_CONFIG_INJECT) { @@ -1010,9 +980,9 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config) int index = 0; if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) { - uint32_t newGpsLock = mAdapter.convertGpsLock(gnssConfigRequested.gpsLock); - if (0 == newGpsLock) { - newGpsLock = 3; + GnssConfigGpsLock newGpsLock = gnssConfigRequested.gpsLock; + if (GNSS_CONFIG_GPS_LOCK_NONE == newGpsLock) { + newGpsLock = GNSS_CONFIG_GPS_LOCK_MO_AND_NI; } if (newGpsLock == ContextBase::mGps_conf.GPS_LOCK || 0 != mAdapter.getPowerVoteId()) { @@ -2846,7 +2816,7 @@ GnssAdapter::enableCommand(LocationTechnologyType techType) })); mAdapter.mXtraObserver.updateLockStatus( - mAdapter.convertGpsLock(GNSS_CONFIG_GPS_LOCK_NONE)); + GNSS_CONFIG_GPS_LOCK_NONE); } mAdapter.reportResponse(err, mSessionId); } @@ -2890,12 +2860,12 @@ GnssAdapter::disableCommand(uint32_t id) mAdapter.setPowerVoteId(0); GnssConfigGpsLock gpsLock = - mAdapter.convertGpsLock(ContextBase::mGps_conf.GPS_LOCK); + ContextBase::mGps_conf.GPS_LOCK; mApi.sendMsg(new LocApiMsg([&mApi = mApi,gpsLock] () { mApi.setGpsLockSync(gpsLock); })); mAdapter.mXtraObserver.updateLockStatus( - mAdapter.convertGpsLock(ContextBase::mGps_conf.GPS_LOCK)); + ContextBase::mGps_conf.GPS_LOCK); } mAdapter.reportResponse(err, mSessionId); } diff --git a/gnss/GnssAdapter.h b/gnss/GnssAdapter.h index 381ccf44..1f72c43c 100644 --- a/gnss/GnssAdapter.h +++ b/gnss/GnssAdapter.h @@ -396,8 +396,6 @@ public: std::string& getMoServerUrl(void) { return mMoServerUrl; } /*==== CONVERSION ===================================================================*/ - static uint32_t convertGpsLock(const GnssConfigGpsLock gpsLock); - static GnssConfigGpsLock convertGpsLock(const uint32_t gpsLock); static uint32_t convertSuplVersion(const GnssConfigSuplVersion suplVersion); static uint32_t convertLppProfile(const GnssConfigLppProfile lppProfile); static uint32_t convertEP4ES(const GnssConfigEmergencyPdnForEmergencySupl); diff --git a/gnss/XtraSystemStatusObserver.cpp b/gnss/XtraSystemStatusObserver.cpp index d84ae424..962e1000 100644 --- a/gnss/XtraSystemStatusObserver.cpp +++ b/gnss/XtraSystemStatusObserver.cpp @@ -56,7 +56,7 @@ using namespace loc_core; #endif #define LOG_TAG "LocSvc_XSSO" -bool XtraSystemStatusObserver::updateLockStatus(uint32_t lock) { +bool XtraSystemStatusObserver::updateLockStatus(GnssConfigGpsLock lock) { mGpsLock = lock; if (!mReqStatusReceived) { diff --git a/gnss/XtraSystemStatusObserver.h b/gnss/XtraSystemStatusObserver.h index b49a0bcd..cbbeda61 100644 --- a/gnss/XtraSystemStatusObserver.h +++ b/gnss/XtraSystemStatusObserver.h @@ -60,7 +60,7 @@ public : inline virtual void getName(string& name); virtual void notify(const list& dlist); - bool updateLockStatus(uint32_t lock); + bool updateLockStatus(GnssConfigGpsLock lock); bool updateConnections(uint64_t allConnections); bool updateTac(const string& tac); bool updateMccMnc(const string& mccmnc); @@ -74,7 +74,7 @@ protected: private: IOsObserver* mSystemStatusObsrvr; const MsgTask* mMsgTask; - int32_t mGpsLock; + GnssConfigGpsLock mGpsLock; uint64_t mConnections; string mTac; string mMccmnc; diff --git a/location/LocationDataTypes.h b/location/LocationDataTypes.h index 5f21e0b2..f60ba78b 100644 --- a/location/LocationDataTypes.h +++ b/location/LocationDataTypes.h @@ -225,12 +225,13 @@ typedef enum { } LocationTechnologyType; // Configures how GPS is locked when GPS is disabled (through GnssDisable) -typedef enum { +enum { GNSS_CONFIG_GPS_LOCK_NONE = 0, // gps is not locked when GPS is disabled (GnssDisable) GNSS_CONFIG_GPS_LOCK_MO, // gps mobile originated (MO) is locked when GPS is disabled GNSS_CONFIG_GPS_LOCK_NI, // gps network initiated (NI) is locked when GPS is disabled GNSS_CONFIG_GPS_LOCK_MO_AND_NI,// gps MO and NI is locked when GPS is disabled -} GnssConfigGpsLock; +}; +typedef int32_t GnssConfigGpsLock; // SUPL version typedef enum {