Enhance debug message

[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 02ac8a3..418613f 100644 (file)
--- a/bt-api/bt-adapter.c
+++ b/bt-api/bt-adapter.c
@@ -28,7 +28,7 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
 {
        int i;
        guint size;
-       bluetooth_device_info_t info;
+       bluetooth_device_info_t *info;
 
        BT_CHECK_PARAMETER(out_param2, return);
        BT_CHECK_PARAMETER(dev_list, return);
@@ -45,10 +45,10 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
        for (i = 0; i < size; i++) {
                bluetooth_device_info_t *dev_info = NULL;
 
-               info = g_array_index(out_param2,
+               info = &g_array_index(out_param2,
                                bluetooth_device_info_t, i);
 
-               dev_info = g_memdup(&info, sizeof(bluetooth_device_info_t));
+               dev_info = g_memdup(info, sizeof(bluetooth_device_info_t));
 
                if (dev_info)
                        g_ptr_array_add(*dev_list, (gpointer)dev_info);
@@ -64,7 +64,7 @@ BT_EXPORT_API int bluetooth_check_adapter(void)
 #ifndef TIZEN_TEST_EMUL
        int ret;
 
-       ret = _bt_get_adapter_path(_bt_gdbus_get_system_gconn(), NULL);
+       ret = _bt_get_adapter_path(_bt_get_system_private_conn(), NULL);
 
        if (ret != BLUETOOTH_ERROR_NONE)
                return BLUETOOTH_ADAPTER_DISABLED;
@@ -85,11 +85,12 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
        int result;
 
        BT_INFO_C("### Enable adapter");
+       _bt_print_api_caller_name();
        retv_if(bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED,
                                BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED);
 
 #ifdef TIZEN_FEATURE_BT_DPM
-       retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_DPM_RESULT_ACCESS_DENIED,
+       retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
                                BLUETOOTH_ERROR_PERMISSION_DEINED);
 #endif
 
@@ -109,6 +110,7 @@ BT_EXPORT_API int bluetooth_disable_adapter(void)
        int result;
 
        BT_INFO_C("### Disable adapter");
+       _bt_print_api_caller_name();
        BT_CHECK_ENABLED(return);
 
        BT_INIT_PARAMS();
@@ -126,7 +128,7 @@ BT_EXPORT_API int bluetooth_recover_adapter(void)
 {
        int result;
 
-       BT_INFO("Recover adapter");
+       BT_INFO_C("### Recover adapter");
        BT_CHECK_ENABLED(return);
 
        BT_INIT_PARAMS();
@@ -277,25 +279,25 @@ BT_EXPORT_API int bluetooth_get_discoverable_mode(bluetooth_discoverable_mode_t
 
        BT_CHECK_PARAMETER(discoverable_mode_ptr, return);
 
-#ifndef TIZEN_PROFILE_WEARABLE
-       int timeout = 0;
-       /* Requirement in OSP */
-       if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
-               if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0) {
-                       BT_ERR("Fail to get the timeout value");
-                       return BLUETOOTH_ERROR_DEVICE_NOT_ENABLED;
-               }
+       if (!TIZEN_PROFILE_WEARABLE) {
+               int timeout = 0;
+               /* Requirement in OSP */
+               if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
+                       if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0) {
+                               BT_ERR("Fail to get the timeout value");
+                               return BLUETOOTH_ERROR_DEVICE_NOT_ENABLED;
+                       }
 
-               if (timeout == -1)
-                       *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE;
-               else
-                       *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE;
+                       if (timeout == -1)
+                               *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE;
+                       else
+                               *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE;
 
-               return BLUETOOTH_ERROR_NONE;
+                       return BLUETOOTH_ERROR_NONE;
+               }
+       } else {
+               BT_CHECK_ENABLED(return);
        }
-#else
-       BT_CHECK_ENABLED(return);
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -364,6 +366,10 @@ BT_EXPORT_API int bluetooth_start_discovery(unsigned short max_response,
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
+       g_array_append_vals(in_param1, &max_response, sizeof(unsigned short));
+       g_array_append_vals(in_param2, &discovery_duration, sizeof(unsigned short));
+       g_array_append_vals(in_param3, &classOfDeviceMask, sizeof(unsigned int));
+
        result = _bt_send_request(BT_BLUEZ_SERVICE, BT_START_DISCOVERY,
                in_param1, in_param2, in_param3, in_param4, &out_param);