diff options
| -rw-r--r-- | core/LocApiBase.cpp | 5 | ||||
| -rw-r--r-- | core/LocApiBase.h | 5 | ||||
| -rw-r--r-- | loc_api/libloc_api_50001/LocEngAdapter.cpp | 16 | ||||
| -rw-r--r-- | loc_api/libloc_api_50001/LocEngAdapter.h | 6 | ||||
| -rw-r--r-- | loc_api/libloc_api_50001/loc_eng.cpp | 33 |
5 files changed, 2 insertions, 63 deletions
diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index 40188f9..c41b906 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -569,11 +569,6 @@ enum loc_api_adapter_err LocApiBase:: setXtraVersionCheck(enum xtra_version_check check) DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS) -int LocApiBase:: - updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event, - loc_registration_mask_status isEnabled) -DEFAULT_IMPL(-1) - bool LocApiBase:: gnssConstellationConfig() DEFAULT_IMPL(false) diff --git a/core/LocApiBase.h b/core/LocApiBase.h index 4500b7e..8849b1f 100644 --- a/core/LocApiBase.h +++ b/core/LocApiBase.h @@ -257,11 +257,6 @@ public: 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(); diff --git a/loc_api/libloc_api_50001/LocEngAdapter.cpp b/loc_api/libloc_api_50001/LocEngAdapter.cpp index 5552045..f39d70f 100644 --- a/loc_api/libloc_api_50001/LocEngAdapter.cpp +++ b/loc_api/libloc_api_50001/LocEngAdapter.cpp @@ -588,22 +588,6 @@ void LocEngAdapter::reportGnssMeasurementData(GnssData &gnssMeasurementData) } /* - Update Registration Mask - */ -void LocEngAdapter::updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event, - loc_registration_mask_status isEnabled) -{ - LOC_LOGD("entering %s", __func__); - int result = LOC_API_ADAPTER_ERR_FAILURE; - result = mLocApi->updateRegistrationMask(event, isEnabled); - if (result == LOC_API_ADAPTER_ERR_SUCCESS) { - LOC_LOGD("%s] update registration mask succeed.", __func__); - } else { - LOC_LOGE("%s] update registration mask failed.", __func__); - } -} - -/* Set Gnss Constellation Config */ bool LocEngAdapter::gnssConstellationConfig() diff --git a/loc_api/libloc_api_50001/LocEngAdapter.h b/loc_api/libloc_api_50001/LocEngAdapter.h index 949a903..60af647 100644 --- a/loc_api/libloc_api_50001/LocEngAdapter.h +++ b/loc_api/libloc_api_50001/LocEngAdapter.h @@ -352,12 +352,6 @@ public: } /* - Update Registration Mask - */ - void updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event, - loc_registration_mask_status isEnabled); - - /* Set Gnss Constellation Config */ bool gnssConstellationConfig(); diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index 3d1fe58..79ed037 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -1666,29 +1666,6 @@ struct LocEngInstallAGpsCert : public LocMsg { } }; -struct LocEngUpdateRegistrationMask : public LocMsg { - loc_eng_data_s_type* mLocEng; - LOC_API_ADAPTER_EVENT_MASK_T mMask; - loc_registration_mask_status mIsEnabled; - inline LocEngUpdateRegistrationMask(loc_eng_data_s_type* locEng, - LOC_API_ADAPTER_EVENT_MASK_T mask, - loc_registration_mask_status isEnabled) : - LocMsg(), mLocEng(locEng), mMask(mask), mIsEnabled(isEnabled) { - locallog(); - } - inline virtual void proc() const { - loc_eng_data_s_type *locEng = (loc_eng_data_s_type *)mLocEng; - locEng->adapter->updateRegistrationMask(mMask, - mIsEnabled); - } - void locallog() const { - LOC_LOGV("LocEngUpdateRegistrationMask\n"); - } - virtual void log() const { - locallog(); - } -}; - struct LocEngGnssConstellationConfig : public LocMsg { LocEngAdapter* mAdapter; inline LocEngGnssConstellationConfig(LocEngAdapter* adapter) : @@ -3053,10 +3030,7 @@ int loc_eng_gps_measurement_init(loc_eng_data_s_type &loc_eng_data, // updated the mask LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT; - loc_eng_data.adapter->sendMsg(new LocEngUpdateRegistrationMask( - &loc_eng_data, - event, - LOC_REGISTRATION_MASK_ENABLED)); + loc_eng_data.adapter->updateEvtMask(event, LOC_REGISTRATION_MASK_ENABLED); // set up the callback loc_eng_data.gnss_measurement_cb = callbacks->gnss_measurement_callback; LOC_LOGD ("%s, event masks updated successfully", __func__); @@ -3088,10 +3062,7 @@ void loc_eng_gps_measurement_close(loc_eng_data_s_type &loc_eng_data) // updated the mask LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT; - loc_eng_data.adapter->sendMsg(new LocEngUpdateRegistrationMask( - &loc_eng_data, - event, - LOC_REGISTRATION_MASK_DISABLED)); + loc_eng_data.adapter->updateEvtMask(event, LOC_REGISTRATION_MASK_DISABLED); // set up the callback loc_eng_data.gnss_measurement_cb = NULL; EXIT_LOG(%d, 0); |