Decouple libhardware usage on LE for gnss models

Remove all usage of gps.h and fused_location.h
from all gnss models except gps/fpl hal librarys

Change-Id: I90ba233c6bbe5c31a4cacceeb981833719c871f2
CRs-Fixed: 1067953

1 files changed, 14 insertions, 14 deletions

diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp
index 35041f6..4cc8cb8 100644
--- a/core/LocApiBase.cpp
+++ b/core/LocApiBase.cpp
@@ -259,13 +259,13 @@ void LocApiBase::reportPosition(UlpLocation &location,
     );
 }
 
-void LocApiBase::reportWwanZppFix(GpsLocation &zppLoc)
+void LocApiBase::reportWwanZppFix(LocGpsLocation &zppLoc)
 {
     // loop through adapters, and deliver to the first handling adapter.
     TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->reportWwanZppFix(zppLoc));
 }
 
-void LocApiBase::reportSv(GnssSvStatus &svStatus,
+void LocApiBase::reportSv(LocGnssSvStatus &svStatus,
                   GpsLocationExtended &locationExtended,
                   void* svExt)
 {
@@ -277,7 +277,7 @@ void LocApiBase::reportSv(GnssSvStatus &svStatus,
         "      sv: constellation svid         cN0"
         "    elevation    azimuth    flags",
         svStatus.num_svs);
-    for (int i = 0; i < svStatus.num_svs && i < GNSS_MAX_SVS; i++) {
+    for (int i = 0; i < svStatus.num_svs && i < LOC_GNSS_MAX_SVS; i++) {
         if (svStatus.gnss_sv_list[i].constellation >
             sizeof(constellationString) / sizeof(constellationString[0]) - 1) {
             svStatus.gnss_sv_list[i].constellation = 0;
@@ -316,7 +316,7 @@ void LocApiBase::reportSvPolynomial(GnssSvPolynomial &svPolynomial)
     );
 }
 
-void LocApiBase::reportStatus(GpsStatusValue status)
+void LocApiBase::reportStatus(LocGpsStatusValue status)
 {
     // loop through adapters, and deliver to all adapters.
     TO_ALL_LOCADAPTERS(mLocAdapters[i]->reportStatus(status));
@@ -354,7 +354,7 @@ void LocApiBase::requestLocation()
     TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->requestLocation());
 }
 
-void LocApiBase::requestATL(int connHandle, AGpsType agps_type)
+void LocApiBase::requestATL(int connHandle, LocAGpsType agps_type)
 {
     // loop through adapters, and deliver to the first handling adapter.
     TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->requestATL(connHandle, agps_type));
@@ -384,7 +384,7 @@ void LocApiBase::reportDataCallClosed()
     TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->reportDataCallClosed());
 }
 
-void LocApiBase::requestNiNotify(GpsNiNotification &notify, const void* data)
+void LocApiBase::requestNiNotify(LocGpsNiNotification &notify, const void* data)
 {
     // loop through adapters, and deliver to the first handling adapter.
     TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->requestNiNotify(notify, data));
@@ -406,7 +406,7 @@ void* LocApiBase :: getSibling()
 LocApiProxyBase* LocApiBase :: getLocApiProxy()
     DEFAULT_IMPL(NULL)
 
-void LocApiBase::reportGnssMeasurementData(GnssData &gnssMeasurementData)
+void LocApiBase::reportGnssMeasurementData(LocGnssData &gnssMeasurementData)
 {
     // loop through adapters, and deliver to all adapters.
     TO_ALL_LOCADAPTERS(mLocAdapters[i]->reportGnssMeasurementData(gnssMeasurementData));
@@ -429,7 +429,7 @@ enum loc_api_adapter_err LocApiBase::
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
-    deleteAidingData(GpsAidingData f)
+    deleteAidingData(LocGpsAidingData f)
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
@@ -445,7 +445,7 @@ enum loc_api_adapter_err LocApiBase::
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
-    setTime(GpsUtcTime time, int64_t timeReference, int uncertainty)
+    setTime(LocGpsUtcTime time, int64_t timeReference, int uncertainty)
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
@@ -458,7 +458,7 @@ DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
    atlOpenStatus(int handle, int is_succ, char* apn,
-                 AGpsBearerType bear, AGpsType agpsType)
+                 AGpsBearerType bear, LocAGpsType agpsType)
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
@@ -479,7 +479,7 @@ enum loc_api_adapter_err LocApiBase::
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
-    informNiResponse(GpsUserResponseType userResponse,
+    informNiResponse(LocGpsUserResponseType userResponse,
                      const void* passThroughData)
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
@@ -539,14 +539,14 @@ enum loc_api_adapter_err LocApiBase::
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
 enum loc_api_adapter_err LocApiBase::
-   getBestAvailableZppFix(GpsLocation& zppLoc)
+   getBestAvailableZppFix(LocGpsLocation& zppLoc)
 {
    memset(&zppLoc, 0, sizeof(zppLoc));
    DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 }
 
 enum loc_api_adapter_err LocApiBase::
-   getBestAvailableZppFix(GpsLocation & zppLoc, LocPosTechMask & tech_mask)
+   getBestAvailableZppFix(LocGpsLocation & zppLoc, LocPosTechMask & tech_mask)
 {
    memset(&zppLoc, 0, sizeof(zppLoc));
    memset(&tech_mask, 0, sizeof(tech_mask));
@@ -578,7 +578,7 @@ int LocApiBase::
 DEFAULT_IMPL(-1)
 
 void LocApiBase::
-    installAGpsCert(const DerEncodedCertificate* pData,
+    installAGpsCert(const LocDerEncodedCertificate* pData,
                     size_t length,
                     uint32_t slotBitMask)
 DEFAULT_IMPL()