Remove bluetooth-api dependency in common library

Change-Id: I4bcb4cdfc0ecb18380f3008dda6d889b3669eb25

diff --git a/src/commonlib/CMakeLists.txt b/src/commonlib/CMakeLists.txt
index 2da0e52a98d0998634107baae5aca6e2279a9f98..bc1a5da59951ec3f6036643c6b1fd9417b52e98e 100755 (executable)
--- a/src/commonlib/CMakeLists.txt
+++ b/src/commonlib/CMakeLists.txt
@@ -24,7 +24,7 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(commonlib_pkges REQUIRED
-               glib-2.0 gio-2.0 gio-unix-2.0 dlog bluetooth-api openssl aul pkgmgr-info libsystemd-daemon)
+               glib-2.0 gio-2.0 gio-unix-2.0 dlog openssl aul pkgmgr-info libsystemd-daemon)
 
 FOREACH(flag ${commonlib_pkges_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/src/commonlib/include/net_nfc_util_internal.h b/src/commonlib/include/net_nfc_util_internal.h
index 322c978b549bfab8e5d1b9a3e5957cc127d0838d..8188b0af3454e9eacf4fc721c4b06b9c7c339323 100755 (executable)
--- a/src/commonlib/include/net_nfc_util_internal.h
+++ b/src/commonlib/include/net_nfc_util_internal.h
@@ -71,11 +71,6 @@ bool net_nfc_util_append_data(data_s *dest, data_s *src);
 void net_nfc_util_clear_data(data_s *data);
 void net_nfc_util_free_data(data_s *data);
 
-net_nfc_conn_handover_carrier_state_e net_nfc_util_get_cps(net_nfc_conn_handover_carrier_type_e carrier_type);
-
-uint8_t *net_nfc_util_get_local_bt_address();
-void net_nfc_util_enable_bluetooth(void);
-
 bool net_nfc_util_strip_string(char *buffer, int buffer_length);
 
 void net_nfc_util_compute_CRC(CRC_type_e CRC_type, uint8_t *buffer, uint32_t length);

diff --git a/src/commonlib/net_nfc_util.c b/src/commonlib/net_nfc_util.c
index de17fee5a897689bd4bd4cfc0cd10af7e2eb162d..4010e7fae6c094dfc20865b4b3664ce440efd161 100755 (executable)
--- a/src/commonlib/net_nfc_util.c
+++ b/src/commonlib/net_nfc_util.c
@@ -26,7 +26,6 @@
 // platform header
 #include "aul.h"
 #include "pkgmgr-info.h"
-#include <bluetooth-api.h>
 #include <vconf.h>
 
 // nfc-manager header
@@ -81,7 +80,6 @@ static const char *schema[] =
 
 // defines for bluetooth api
 #define USE_BLUETOOTH_API
-static uint8_t *bt_addr = NULL;
 
 /* for log tag */
 #define NET_NFC_MANAGER_NAME "nfc-manager-daemon"
@@ -297,126 +295,6 @@ NET_NFC_EXPORT_API void net_nfc_util_free_data(data_s *data)
        _net_nfc_util_free_mem(data);
 }
 
-net_nfc_conn_handover_carrier_state_e net_nfc_util_get_cps(net_nfc_conn_handover_carrier_type_e carrier_type)
-{
-       net_nfc_conn_handover_carrier_state_e cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
-
-       if (carrier_type == NET_NFC_CONN_HANDOVER_CARRIER_BT)
-       {
-               int ret = bluetooth_check_adapter();
-
-               switch (ret)
-               {
-               case BLUETOOTH_ADAPTER_ENABLED :
-                       cps = NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATE;
-                       break;
-
-               case BLUETOOTH_ADAPTER_CHANGING_ENABLE :
-                       cps = NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATING;
-                       break;
-
-               case BLUETOOTH_ADAPTER_DISABLED :
-               case BLUETOOTH_ADAPTER_CHANGING_DISABLE :
-               case BLUETOOTH_ERROR_NO_RESOURCES :
-               default :
-                       cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
-                       break;
-               }
-       }
-       else if (carrier_type == NET_NFC_CONN_HANDOVER_CARRIER_WIFI_BSS)
-       {
-               int wifi_state = 0;
-
-               (void)vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
-
-               switch (wifi_state)
-               {
-               case VCONFKEY_WIFI_UNCONNECTED :
-               case VCONFKEY_WIFI_CONNECTED :
-               case VCONFKEY_WIFI_TRANSFER :
-                       cps = NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATE;
-                       break;
-
-               case VCONFKEY_WIFI_OFF :
-               default :
-                       cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
-                       break;
-               }
-       }
-
-       return cps;
-}
-
-#define BLUETOOTH_ADDRESS_LENGTH       6
-#define HIDDEN_BT_ADDR_FILE            "/opt/etc/.bd_addr"
-
-uint8_t *net_nfc_util_get_local_bt_address()
-{
-       if (bt_addr != NULL)
-       {
-               return bt_addr;
-       }
-
-       _net_nfc_util_alloc_mem(bt_addr, BLUETOOTH_ADDRESS_LENGTH);
-       if (bt_addr != NULL)
-       {
-               if (net_nfc_util_get_cps(NET_NFC_CONN_HANDOVER_CARRIER_BT) != NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATE)
-               {
-                       // bt power is off. so get bt address from configuration file.
-                       FILE *fp = NULL;
-
-                       if ((fp = fopen(HIDDEN_BT_ADDR_FILE, "r")) != NULL)
-                       {
-                               unsigned char temp[BLUETOOTH_ADDRESS_LENGTH * 2] = { 0, };
-
-                               int ch;
-                               int count = 0;
-                               int i = 0;
-
-                               while ((ch = fgetc(fp)) != EOF && count < BLUETOOTH_ADDRESS_LENGTH * 2)
-                               {
-                                       if (((ch >= '0') && (ch <= '9')))
-                                       {
-                                               temp[count++] = ch - '0';
-                                       }
-                                       else if (((ch >= 'a') && (ch <= 'z')))
-                                       {
-                                               temp[count++] = ch - 'a' + 10;
-                                       }
-                                       else if (((ch >= 'A') && (ch <= 'Z')))
-                                       {
-                                               temp[count++] = ch - 'A' + 10;
-                                       }
-                               }
-
-                               for (; i < BLUETOOTH_ADDRESS_LENGTH; i++)
-                               {
-                                       bt_addr[i] = temp[i * 2] << 4 | temp[i * 2 + 1];
-                               }
-
-                               fclose(fp);
-                       }
-               }
-               else
-               {
-                       bluetooth_device_address_t local_address;
-
-                       memset(&local_address, 0x00, sizeof(bluetooth_device_address_t));
-
-                       bluetooth_get_local_address(&local_address);
-
-                       memcpy(bt_addr, &local_address.addr, BLUETOOTH_ADDRESS_LENGTH);
-               }
-       }
-
-       return bt_addr;
-}
-
-void net_nfc_util_enable_bluetooth(void)
-{
-       bluetooth_enable_adapter();
-}
-
 bool net_nfc_util_strip_string(char *buffer, int buffer_length)
 {
        bool result = false;

diff --git a/src/manager/net_nfc_server_handover_bt.c b/src/manager/net_nfc_server_handover_bt.c
index f508b57d1b2753be1d63a4e1e4569786142a0fd1..092fb4787824eeafdec32cd8e91ccce6729250ec 100755 (executable)
--- a/src/manager/net_nfc_server_handover_bt.c
+++ b/src/manager/net_nfc_server_handover_bt.c
@@ -16,6 +16,7 @@
 
 #include <bluetooth.h>
 #include <bluetooth_internal.h>
+#include <bluetooth-api.h>
 
 #ifdef USE_SYSTEM_INFO
 #include "system_info.h"
@@ -75,6 +76,105 @@ static int _bt_prepare_pairing(net_nfc_handover_bt_process_context_t *context);
 static int _bt_do_pairing(net_nfc_handover_bt_process_context_t *context);
 
 
+net_nfc_conn_handover_carrier_state_e net_nfc_server_handover_bt_get_cps()
+{
+       net_nfc_conn_handover_carrier_state_e cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
+
+       int ret = bluetooth_check_adapter();
+
+       switch (ret)
+       {
+       case BLUETOOTH_ADAPTER_ENABLED :
+               cps = NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATE;
+               break;
+
+       case BLUETOOTH_ADAPTER_CHANGING_ENABLE :
+               cps = NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATING;
+               break;
+
+       case BLUETOOTH_ADAPTER_DISABLED :
+       case BLUETOOTH_ADAPTER_CHANGING_DISABLE :
+       case BLUETOOTH_ERROR_NO_RESOURCES :
+       default :
+               cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
+               break;
+       }
+
+       return cps;
+}
+
+#define BLUETOOTH_ADDRESS_LENGTH       6
+#define HIDDEN_BT_ADDR_FILE            "/opt/etc/.bd_addr"
+
+uint8_t *net_nfc_server_handover_bt_get_local_address()
+{
+       static uint8_t *bt_addr = NULL;
+
+       if (bt_addr != NULL)
+       {
+               return bt_addr;
+       }
+
+       _net_nfc_util_alloc_mem(bt_addr, BLUETOOTH_ADDRESS_LENGTH);
+       if (bt_addr != NULL)
+       {
+               if (net_nfc_server_handover_bt_get_cps() != NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATE)
+               {
+                       // bt power is off. so get bt address from configuration file.
+                       FILE *fp = NULL;
+
+                       if ((fp = fopen(HIDDEN_BT_ADDR_FILE, "r")) != NULL)
+                       {
+                               unsigned char temp[BLUETOOTH_ADDRESS_LENGTH * 2] = { 0, };
+
+                               int ch;
+                               int count = 0;
+                               int i = 0;
+
+                               while ((ch = fgetc(fp)) != EOF && count < BLUETOOTH_ADDRESS_LENGTH * 2)
+                               {
+                                       if (((ch >= '0') && (ch <= '9')))
+                                       {
+                                               temp[count++] = ch - '0';
+                                       }
+                                       else if (((ch >= 'a') && (ch <= 'z')))
+                                       {
+                                               temp[count++] = ch - 'a' + 10;
+                                       }
+                                       else if (((ch >= 'A') && (ch <= 'Z')))
+                                       {
+                                               temp[count++] = ch - 'A' + 10;
+                                       }
+                               }
+
+                               for (; i < BLUETOOTH_ADDRESS_LENGTH; i++)
+                               {
+                                       bt_addr[i] = temp[i * 2] << 4 | temp[i * 2 + 1];
+                               }
+
+                               fclose(fp);
+                       }
+               }
+               else
+               {
+                       bluetooth_device_address_t local_address;
+
+                       memset(&local_address, 0x00, sizeof(bluetooth_device_address_t));
+
+                       bluetooth_get_local_address(&local_address);
+
+                       memcpy(bt_addr, &local_address.addr, BLUETOOTH_ADDRESS_LENGTH);
+               }
+       }
+
+       return bt_addr;
+}
+
+void net_nfc_util_enable_bluetooth(void)
+{
+       bluetooth_enable_adapter();
+}
+
 static net_nfc_error_e _bt_get_oob_data_from_config(
        net_nfc_carrier_config_s *config,
        net_nfc_handover_bt_oob_data_t *oob)

diff --git a/src/manager/net_nfc_server_handover_wps.c b/src/manager/net_nfc_server_handover_wps.c
index e0e152ecc4038a2e5103d06e9a195528aa381fbc..1ed5b285de6321c376f454914ba670081e6c9a82 100755 (executable)
--- a/src/manager/net_nfc_server_handover_wps.c
+++ b/src/manager/net_nfc_server_handover_wps.c
@@ -25,6 +25,7 @@
 #include "net_nfc_server_handover_internal.h"
 #include "net_nfc_server_llcp.h"
 
+#include <vconf.h>
 
 typedef struct _wps_process_context_t
 {
@@ -35,6 +36,30 @@ typedef struct _wps_process_context_t
 }
 wps_process_context_t;
 
+net_nfc_conn_handover_carrier_state_e net_nfc_server_handover_wps_get_cps()
+{
+       int wifi_state = 0;
+       net_nfc_conn_handover_carrier_state_e cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
+
+       (void)vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
+
+       switch (wifi_state)
+       {
+       case VCONFKEY_WIFI_UNCONNECTED :
+       case VCONFKEY_WIFI_CONNECTED :
+       case VCONFKEY_WIFI_TRANSFER :
+               cps = NET_NFC_CONN_HANDOVER_CARRIER_ACTIVATE;
+               break;
+
+       case VCONFKEY_WIFI_OFF :
+       default :
+               cps = NET_NFC_CONN_HANDOVER_CARRIER_INACTIVATE;
+               break;
+       }
+
+       return cps;
+}
+
 static char *_wps_get_string_property(net_nfc_carrier_config_s *config,
        uint16_t attr)
 {