diff options
| author | Wei Chen <weic@codeaurora.org> | 2019-07-18 15:50:55 -0700 |
|---|---|---|
| committer | Yingjie Wang <yingjiewang@codeaurora.org> | 2019-08-23 12:56:14 +0800 |
| commit | 1a1232c5949192d555f3e69aa7427dfcdbca7134 (patch) | |
| tree | 544fa0835c775b97f02b93ebb7f0ba42128a3f77 /core | |
| parent | 5ee0b62e8c53ba6a57300541dbbae6b2e9cf9a8a (diff) | |
| download | gps-1a1232c5949192d555f3e69aa7427dfcdbca7134.tar.gz | |
GPS hw: report ppe/spe report with combined report
When DRE/PPE are also running in the system, in addition to
reporitng the combined final output, add the support to
report the unmodified SPE/PPE report received from the engine
Change-Id: Icb636824da32b175030dfcd2b270ac8b500ff75b
CRs-fixed: 2487580
Diffstat (limited to 'core')
| -rw-r--r-- | core/EngineHubProxyBase.h | 19 | ||||
| -rw-r--r-- | core/LocAdapterBase.cpp | 1 | ||||
| -rw-r--r-- | core/LocAdapterBase.h | 6 | ||||
| -rw-r--r-- | core/LocApiBase.cpp | 1 |
4 files changed, 13 insertions, 14 deletions
diff --git a/core/EngineHubProxyBase.h b/core/EngineHubProxyBase.h index 4239a50..ec881f6 100644 --- a/core/EngineHubProxyBase.h +++ b/core/EngineHubProxyBase.h @@ -103,12 +103,8 @@ public: } }; -typedef std::function<void(const UlpLocation& ulpLocation, - const GpsLocationExtended& locationExtended, - enum loc_sess_status status, - LocPosTechMask techMask, - bool fromEngineHub)> - GnssAdapterReportPositionEventCb; +typedef std::function<void(int count, EngineLocationInfo* locationArr)> + GnssAdapterReportEnginePositionsEventCb; typedef std::function<void(const GnssSvNotification& svNotify, bool fromEngineHub)> @@ -119,11 +115,12 @@ typedef std::function<void(const GnssAidingDataSvMask& svDataMask)> // potential parameters: message queue: MsgTask * msgTask; // callback function to report back dr and ppe position and sv report -typedef EngineHubProxyBase* (getEngHubProxyFn)(const MsgTask * msgTask, - IOsObserver* osObserver, - GnssAdapterReportPositionEventCb positionEventCb, - GnssAdapterReportSvEventCb svEventCb, - GnssAdapterReqAidingDataCb reqAidingDataCb); +typedef EngineHubProxyBase* (getEngHubProxyFn)( + const MsgTask * msgTask, + IOsObserver* osObserver, + GnssAdapterReportEnginePositionsEventCb positionEventCb, + GnssAdapterReportSvEventCb svEventCb, + GnssAdapterReqAidingDataCb reqAidingDataCb); } // namespace loc_core diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp index ffd3d5a..1b844e5 100644 --- a/core/LocAdapterBase.cpp +++ b/core/LocAdapterBase.cpp @@ -81,7 +81,6 @@ void LocAdapterBase:: const GpsLocationExtended& locationExtended, enum loc_sess_status status, LocPosTechMask loc_technology_mask, - bool /*fromEngineHub*/, GnssDataNotification* pDataNotify, int msInWeek) { diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h index b9b1f1e..909b6fe 100644 --- a/core/LocAdapterBase.h +++ b/core/LocAdapterBase.h @@ -151,9 +151,13 @@ public: const GpsLocationExtended& locationExtended, enum loc_sess_status status, LocPosTechMask loc_technology_mask, - bool fromEngineHub = false, GnssDataNotification* pDataNotify = nullptr, int msInWeek = -1); + virtual void reportEnginePositionsEvent(unsigned int count, + EngineLocationInfo* locationArr) { + (void)count; + (void)locationArr; + } virtual void reportSvEvent(const GnssSvNotification& svNotify, bool fromEngineHub=false); virtual void reportDataEvent(const GnssDataNotification& dataNotify, int msInWeek); diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index 14472fa..8c79cf7 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -345,7 +345,6 @@ void LocApiBase::reportPosition(UlpLocation& location, TO_ALL_LOCADAPTERS( mLocAdapters[i]->reportPositionEvent(location, locationExtended, status, loc_technology_mask, - false, pDataNotify, msInWeek) ); } |