Merge "Cleanup HID device codes." into tizen_4.0

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

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 62308e0..3aec238 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -375,7 +375,7 @@ gboolean __bt_reliable_disable_cb(gpointer user_data)
         _bt_rfcomm_server_free_all();
 #endif
 
-       _bluetooth_hid_free_hid_info();
+       _bt_hid_free_hid_info();
 
        BT_DBG("-");
        return FALSE;
@@ -1284,10 +1284,10 @@ void __bt_hid_device_event_filter(GDBusConnection *connection,
                                                address);
                int ctrl = -1, intr = -1;
                _bt_hid_device_get_fd(address, &ctrl, &intr);
-               if (ctrl != -1 && intr != -1) {
-                       new_hid_connection(NULL, ctrl, &dev_address);
-                       new_hid_connection(NULL, intr, &dev_address);
-               }
+               if (ctrl != -1 && intr != -1)
+                       _bt_hid_new_connection(&dev_address, ctrl, intr);
+               else
+                       BT_ERR("fd is invalid.(ctrl=%d, intr=%d)", ctrl, intr);
        } else if (strcasecmp(signal_name, BT_INPUT_HID_DEVICE_DISCONNECTED) == 0) {
                const char *address = NULL;
                g_variant_get(parameters, "(i&s)", &result, &address);