From f7102b858dc849cc94255bc96f95b880dfd93452 Mon Sep 17 00:00:00 2001
From: Fedor917 <cryscript@gmail.com>
Date: Thu, 10 Nov 2016 15:53:00 +0700
Subject: Initialising brunch based on davidevinavil device tree (CM14.0
 branch)

---
 gps/core/ContextBase.cpp | 72 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 24 deletions(-)

(limited to 'gps/core/ContextBase.cpp')

diff --git a/gps/core/ContextBase.cpp b/gps/core/ContextBase.cpp
index 9f6c4aa..d2f9070 100644
--- a/gps/core/ContextBase.cpp
+++ b/gps/core/ContextBase.cpp
@@ -35,11 +35,32 @@
 #include <ContextBase.h>
 #include <msg_q.h>
 #include <loc_target.h>
-#include <log_util.h>
+#include <platform_lib_includes.h>
 #include <loc_log.h>
 
 namespace loc_core {
 
+loc_gps_cfg_s_type ContextBase::mGps_conf {0};
+loc_sap_cfg_s_type ContextBase::mSap_conf {0};
+
+uint32_t ContextBase::getCarrierCapabilities() {
+    #define carrierMSA (uint32_t)0x2
+    #define carrierMSB (uint32_t)0x1
+    #define gpsConfMSA (uint32_t)0x4
+    #define gpsConfMSB (uint32_t)0x2
+    uint32_t capabilities = mGps_conf.CAPABILITIES;
+    if ((mGps_conf.SUPL_MODE & carrierMSA) != carrierMSA) {
+        capabilities &= ~gpsConfMSA;
+    }
+    if ((mGps_conf.SUPL_MODE & carrierMSB) != carrierMSB) {
+        capabilities &= ~gpsConfMSB;
+    }
+
+    LOC_LOGV("getCarrierCapabilities: CAPABILITIES %x, SUPL_MODE %x, carrier capabilities %x",
+             mGps_conf.CAPABILITIES, mGps_conf.SUPL_MODE, capabilities);
+    return capabilities;
+}
+
 LBSProxyBase* ContextBase::getLBSProxy(const char* libName)
 {
     LBSProxyBase* proxy = NULL;
@@ -52,6 +73,10 @@ LBSProxyBase* ContextBase::getLBSProxy(const char* libName)
             proxy = (*getter)();
         }
     }
+    else
+    {
+        LOC_LOGW("%s:%d]: FAILED TO LOAD libname: %s\n", __func__, __LINE__, libName);
+    }
     if (NULL == proxy) {
         proxy = new LBSProxyBase();
     }
@@ -63,30 +88,29 @@ LocApiBase* ContextBase::createLocApi(LOC_API_ADAPTER_EVENT_MASK_T exMask)
 {
     LocApiBase* locApi = NULL;
 
-    // first if can not be MPQ
-    if (TARGET_MPQ != loc_get_target()) {
-        if (NULL == (locApi = mLBSProxy->getLocApi(mMsgTask, exMask, this))) {
-            void *handle = NULL;
-            //try to see if LocApiV02 is present
-            if((handle = dlopen("libloc_api_v02.so", RTLD_NOW)) != NULL) {
-                LOC_LOGD("%s:%d]: libloc_api_v02.so is present", __func__, __LINE__);
-                getLocApi_t* getter = (getLocApi_t*)dlsym(handle, "getLocApi");
-                if(getter != NULL) {
-                    LOC_LOGD("%s:%d]: getter is not NULL for LocApiV02", __func__, __LINE__);
-                    locApi = (*getter)(mMsgTask, exMask, this);
-                }
+    if (NULL == (locApi = mLBSProxy->getLocApi(mMsgTask, exMask, this))) {
+        void *handle = NULL;
+        //try to see if LocApiV02 is present
+        if ((handle = dlopen("libloc_api_v02.so", RTLD_NOW)) != NULL) {
+            LOC_LOGD("%s:%d]: libloc_api_v02.so is present", __func__, __LINE__);
+            getLocApi_t* getter = (getLocApi_t*) dlsym(handle, "getLocApi");
+            if (getter != NULL) {
+                LOC_LOGD("%s:%d]: getter is not NULL for LocApiV02", __func__,
+                        __LINE__);
+                locApi = (*getter)(mMsgTask, exMask, this);
             }
-            // only RPC is the option now
-            else {
-                LOC_LOGD("%s:%d]: libloc_api_v02.so is NOT present. Trying RPC",
-                         __func__, __LINE__);
-                handle = dlopen("libloc_api-rpc-qc.so", RTLD_NOW);
-                if (NULL != handle) {
-                    getLocApi_t* getter = (getLocApi_t*)dlsym(handle, "getLocApi");
-                    if (NULL != getter) {
-                        LOC_LOGD("%s:%d]: getter is not NULL in RPC", __func__, __LINE__);
-                        locApi = (*getter)(mMsgTask, exMask, this);
-                    }
+        }
+        // only RPC is the option now
+        else {
+            LOC_LOGD("%s:%d]: libloc_api_v02.so is NOT present. Trying RPC",
+                    __func__, __LINE__);
+            handle = dlopen("libloc_api-rpc-qc.so", RTLD_NOW);
+            if (NULL != handle) {
+                getLocApi_t* getter = (getLocApi_t*) dlsym(handle, "getLocApi");
+                if (NULL != getter) {
+                    LOC_LOGD("%s:%d]: getter is not NULL in RPC", __func__,
+                            __LINE__);
+                    locApi = (*getter)(mMsgTask, exMask, this);
                 }
             }
         }
-- 
cgit v1.2.3