From a41611eb5294d5602bcc20fd79108c7df97527a2 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 3 Jan 2013 14:23:37 +0200 Subject: [PATCH] core: Prefer adapter_register/unregister over manager functions --- src/mgmt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mgmt.c b/src/mgmt.c index bd598a7c8..08bceb329 100644 --- a/src/mgmt.c +++ b/src/mgmt.c @@ -46,7 +46,6 @@ #include "log.h" #include "adapter.h" -#include "manager.h" #include "device.h" #include "eir.h" #include "storage.h" @@ -215,7 +214,7 @@ static void remove_controller(uint16_t index) DBG("Removing controller %u", index); - btd_manager_unregister_adapter(index); + adapter_unregister(index); g_slist_free_full(controllers[index].pending_uuids, g_free); controllers[index].pending_uuids = NULL; @@ -1224,8 +1223,7 @@ static void read_info_complete(uint16_t index, void *buf, size_t len) clear_uuids(index); - adapter = btd_manager_register_adapter(index, - mgmt_powered(info->current_settings), + adapter = adapter_register(index, mgmt_powered(info->current_settings), mgmt_connectable(info->current_settings), mgmt_discoverable(info->current_settings)); -- 2.47.3