From e5c53750f06e9d9739b45ec108260ead7ff80941 Mon Sep 17 00:00:00 2001
From: Isaac Chen <isaacchen@isaacchen.cn>
Date: Mon, 31 Dec 2018 10:55:08 +0100
Subject: wayne-common: Synchorize gps to P

 * QC Tag: LA.UM.7.2.r1-04900-sdm660.0

Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn>
Change-Id: I34383e8fbf394b774f83f8d662873e8786ff1bbf
---
 gps/gnss/Agps.h | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'gps/gnss/Agps.h')

diff --git a/gps/gnss/Agps.h b/gps/gnss/Agps.h
index 2f89c8c..703a475 100644
--- a/gps/gnss/Agps.h
+++ b/gps/gnss/Agps.h
@@ -34,7 +34,8 @@
 #include <list>
 #include <MsgTask.h>
 #include <gps_extended_c.h>
-#include <platform_lib_log_util.h>
+#include <loc_pla.h>
+#include <log_util.h>
 
 /* ATL callback function pointers
  * Passed in by Adapter to AgpsManager */
@@ -277,34 +278,29 @@ public:
         mAgnssNif(NULL), mInternetNif(NULL), mDsNif(NULL) {}
 
     /* Register callbacks */
-    void registerCallbacks(
-            AgnssStatusIpV4Cb                   frameworkStatusV4Cb,
-
-            AgpsAtlOpenStatusCb                 atlOpenStatusCb,
+    inline void registerATLCallbacks(AgpsAtlOpenStatusCb  atlOpenStatusCb,
             AgpsAtlCloseStatusCb                atlCloseStatusCb,
-
             AgpsDSClientInitFn                  dsClientInitFn,
             AgpsDSClientOpenAndStartDataCallFn  dsClientOpenAndStartDataCallFn,
             AgpsDSClientStopDataCallFn          dsClientStopDataCallFn,
             AgpsDSClientCloseDataCallFn         dsClientCloseDataCallFn,
             AgpsDSClientReleaseFn               dsClientReleaseFn,
-
-            SendMsgToAdapterMsgQueueFn          sendMsgToAdapterQueueFn ){
-
-        mFrameworkStatusV4Cb = frameworkStatusV4Cb;
+            SendMsgToAdapterMsgQueueFn          sendMsgToAdapterQueueFn) {
 
         mAtlOpenStatusCb = atlOpenStatusCb;
         mAtlCloseStatusCb = atlCloseStatusCb;
-
         mDSClientInitFn = dsClientInitFn;
         mDSClientOpenAndStartDataCallFn = dsClientOpenAndStartDataCallFn;
         mDSClientStopDataCallFn = dsClientStopDataCallFn;
         mDSClientCloseDataCallFn = dsClientCloseDataCallFn;
         mDSClientReleaseFn = dsClientReleaseFn;
-
         mSendMsgToAdapterQueueFn = sendMsgToAdapterQueueFn;
     }
 
+    inline void registerFrameworkStatusCallback(AgnssStatusIpV4Cb frameworkStatusV4Cb) {
+        mFrameworkStatusV4Cb = frameworkStatusV4Cb;
+    }
+
     /* Create all AGPS state machines */
     void createAgpsStateMachines();
 
-- 
cgit v1.2.3