Merge the code from private

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-adapter.c

diff --git a/bt-api/bt-adapter.c b/bt-api/bt-adapter.c
index 2391393..42fea38 100644 (file)
--- a/bt-api/bt-adapter.c
+++ b/bt-api/bt-adapter.c
@@ -60,14 +60,17 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
 
 BT_EXPORT_API int bluetooth_check_adapter(void)
 {
+       int value = VCONFKEY_BT_STATUS_OFF;
+
+#ifndef TIZEN_TEST_EMUL
        int ret;
-       int value;
 
        ret = _bt_get_adapter_path(_bt_gdbus_get_system_gconn(), NULL);
 
        if (ret != BLUETOOTH_ERROR_NONE) {
                return BLUETOOTH_ADAPTER_DISABLED;
        }
+#endif
 
        /* check VCONFKEY_BT_STATUS */
        if (vconf_get_int(VCONFKEY_BT_STATUS, &value) != 0) {
@@ -82,26 +85,21 @@ BT_EXPORT_API int bluetooth_check_adapter(void)
 BT_EXPORT_API int bluetooth_enable_adapter(void)
 {
        int result;
-       bt_user_info_t *user_info;
 
-       BT_INFO("");
+       BT_INFO_C("### Enable adapter");
        retv_if(bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED,
                                BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED);
 
 #ifdef TIZEN_DPM_VCONF_ENABLE
-       retv_if(bluetooth_dpm_is_bluetooth_mode_allowed() == BLUETOOTH_DPM_RESULT_ACCESS_DENIED,
+       retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_DPM_RESULT_ACCESS_DENIED,
                                BLUETOOTH_ERROR_PERMISSION_DEINED);
 #endif
 
-       user_info = _bt_get_user_data(BT_COMMON);
-       retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
-
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
-       result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_ENABLE_ADAPTER,
-               in_param1, in_param2, in_param3, in_param4,
-               user_info->cb, user_info->user_data);
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_ENABLE_ADAPTER,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
 
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
@@ -111,20 +109,15 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
 BT_EXPORT_API int bluetooth_disable_adapter(void)
 {
        int result;
-       bt_user_info_t *user_info;
 
-       BT_INFO("");
+       BT_INFO_C("### Disable adapter");
        BT_CHECK_ENABLED(return);
 
-       user_info = _bt_get_user_data(BT_COMMON);
-       retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
-
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
-       result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_DISABLE_ADAPTER,
-               in_param1, in_param2, in_param3, in_param4,
-               user_info->cb, user_info->user_data);
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_DISABLE_ADAPTER,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
 
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
@@ -135,7 +128,7 @@ BT_EXPORT_API int bluetooth_recover_adapter(void)
 {
        int result;
 
-       BT_INFO("");
+       BT_INFO("Recover adapter");
        BT_CHECK_ENABLED(return);
 
        BT_INIT_PARAMS();
@@ -288,7 +281,7 @@ BT_EXPORT_API int bluetooth_get_discoverable_mode(bluetooth_discoverable_mode_t
 
        BT_CHECK_PARAMETER(discoverable_mode_ptr, return);
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        int timeout = 0;
        /* Requirement in OSP */
        if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
@@ -446,6 +439,7 @@ BT_EXPORT_API int bluetooth_is_discovering(void)
                                int, 0);
        } else {
                BT_ERR("Fail to send request");
+               is_discovering = result;
        }
 
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -516,6 +510,60 @@ BT_EXPORT_API int bluetooth_get_bonded_device_list(GPtrArray **dev_list)
        return result;
 }
 
+BT_EXPORT_API int bluetooth_get_profile_connected_device_list(
+               const char *profile_uuid, GPtrArray **addr_list)
+{
+       char uuid[BLUETOOTH_UUID_STRING_MAX];
+       int result;
+       guint size;
+       int i;
+
+       BT_CHECK_PARAMETER(profile_uuid, return);
+       BT_CHECK_PARAMETER(addr_list, return);
+       BT_CHECK_ENABLED(return);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_strlcpy(uuid, profile_uuid, sizeof(uuid));
+       g_array_append_vals(in_param1, uuid, BLUETOOTH_UUID_STRING_MAX);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GET_PROFILE_CONNECTED_DEVICES,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE) {
+               if (out_param == NULL) {
+                       BT_ERR("out_param is NULL");
+                       result = BLUETOOTH_ERROR_INTERNAL;
+               } else {
+                       size = (out_param->len) / sizeof(bluetooth_device_address_t);
+
+                       if (size == 0) {
+                               BT_ERR("No connected device");
+                               result = BLUETOOTH_ERROR_NOT_CONNECTED;
+                       }
+
+                       for (i = 0; i < size; i++) {
+                               bluetooth_device_address_t *addr = NULL;
+                               bluetooth_device_address_t *ptr = NULL;
+
+                               ptr = &g_array_index(out_param,
+                                               bluetooth_device_address_t, i);
+
+                               addr = g_memdup(ptr, sizeof(bluetooth_device_address_t));
+
+                               if (addr) {
+                                       g_ptr_array_add(*addr_list, (gpointer)addr);
+                               }
+                       }
+               }
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
 BT_EXPORT_API int bluetooth_set_manufacturer_data(const bluetooth_manufacturer_data_t *value)
 {
        int result;
@@ -538,3 +586,23 @@ BT_EXPORT_API int bluetooth_set_manufacturer_data(const bluetooth_manufacturer_d
 
        return result;
 }
+
+BT_EXPORT_API int bluetooth_set_passkey_notification(gboolean enable)
+{
+       int result;
+
+       BT_CHECK_ENABLED_ANY(return);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &enable, sizeof(gboolean));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_SET_PASSKEY_NOTIFICATION,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+