diff options
Diffstat (limited to 'src/adapter.c')
| -rw-r--r-- | src/adapter.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/adapter.c b/src/adapter.c index ea306e415..eaf1f5efc 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2876,7 +2876,7 @@ static int device_path_cmp(gconstpointer a, gconstpointer b) { const struct btd_device *device = a; const char *path = b; - const char *dev_path = device_get_path(device); + const char *dev_path = btd_device_get_path(device); return strcasecmp(dev_path, path); } @@ -3870,19 +3870,19 @@ int adapter_connect_list_add(struct btd_adapter *adapter, if (g_slist_find(adapter->connect_list, device)) { DBG("ignoring already added device %s", - device_get_path(device)); + btd_device_get_path(device)); goto done; } if (!(adapter->supported_settings & MGMT_SETTING_LE)) { btd_error(adapter->dev_id, "Can't add %s to non-LE capable adapter connect list", - device_get_path(device)); + btd_device_get_path(device)); return -ENOTSUP; } adapter->connect_list = g_slist_append(adapter->connect_list, device); - DBG("%s added to %s's connect_list", device_get_path(device), + DBG("%s added to %s's connect_list", btd_device_get_path(device), adapter->system_name); done: @@ -3910,13 +3910,13 @@ void adapter_connect_list_remove(struct btd_adapter *adapter, if (!g_slist_find(adapter->connect_list, device)) { DBG("device %s is not on the list, ignoring", - device_get_path(device)); + btd_device_get_path(device)); return; } adapter->connect_list = g_slist_remove(adapter->connect_list, device); - DBG("%s removed from %s's connect_list", device_get_path(device), - adapter->system_name); + DBG("%s removed from %s's connect_list", + btd_device_get_path(device), adapter->system_name); if (!adapter->connect_list) { stop_passive_scanning(adapter); @@ -4067,7 +4067,7 @@ void adapter_auto_connect_add(struct btd_adapter *adapter, if (g_slist_find(adapter->connect_list, device)) { DBG("ignoring already added device %s", - device_get_path(device)); + btd_device_get_path(device)); return; } @@ -4127,7 +4127,8 @@ void adapter_auto_connect_remove(struct btd_adapter *adapter, return; if (!g_slist_find(adapter->connect_list, device)) { - DBG("ignoring not added device %s", device_get_path(device)); + DBG("ignoring not added device %s", + btd_device_get_path(device)); return; } @@ -5674,7 +5675,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter, adapter->connections = g_slist_remove(adapter->connections, device); if (device_is_temporary(device) && !device_is_retrying(device)) { - const char *path = device_get_path(device); + const char *path = btd_device_get_path(device); DBG("Removing temporary device %s", path); btd_adapter_remove_device(adapter, device); @@ -5841,7 +5842,7 @@ static gboolean process_auth_queue(gpointer user_data) goto next; } - dev_path = device_get_path(device); + dev_path = btd_device_get_path(device); if (agent_authorize_service(auth->agent, dev_path, auth->uuid, agent_auth_cb, adapter, NULL) < 0) { |