From 5a9df8a3cef638e5d6ffa96451929a1116308082 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 3 Jan 2013 16:03:11 +0200
Subject: [PATCH] core: Pass the mgmt settings directly to adapter_register()

---
 src/adapter.c | 14 ++++++--------
 src/adapter.h |  3 +--
 src/mgmt.c    |  5 +----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 8c4d3b137..019e56d43 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2797,14 +2797,13 @@ static void load_config(struct btd_adapter *adapter)
 	g_key_file_free(key_file);
 }
 
-static gboolean adapter_setup(struct btd_adapter *adapter, gboolean powered,
-					bool connectable, bool discoverable)
+static gboolean adapter_setup(struct btd_adapter *adapter, uint32_t settings)
 {
 	struct agent *agent;
 
-	adapter->powered = powered;
-	adapter->connectable = connectable;
-	adapter->discoverable = discoverable;
+	adapter->powered = mgmt_powered(settings);
+	adapter->connectable = mgmt_connectable(settings);
+	adapter->discoverable = mgmt_discoverable(settings);
 
 	mgmt_read_bdaddr(adapter->dev_id, &adapter->bdaddr);
 
@@ -3678,8 +3677,7 @@ void adapter_foreach(adapter_cb func, gpointer user_data)
 	g_slist_foreach(adapters, (GFunc) func, user_data);
 }
 
-struct btd_adapter *adapter_register(int id, bool powered, bool connectable,
-							bool discoverable)
+struct btd_adapter *adapter_register(int id, uint32_t settings)
 {
 	struct btd_adapter *adapter;
 
@@ -3695,7 +3693,7 @@ struct btd_adapter *adapter_register(int id, bool powered, bool connectable,
 
 	adapters = g_slist_append(adapters, adapter);
 
-	if (!adapter_setup(adapter, powered, connectable, discoverable)) {
+	if (!adapter_setup(adapter, settings)) {
 		adapters = g_slist_remove(adapters, adapter);
 		btd_adapter_unref(adapter);
 		return NULL;
diff --git a/src/adapter.h b/src/adapter.h
index 326b666cf..d3adace79 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -78,8 +78,7 @@ struct btd_adapter *adapter_find(const bdaddr_t *sba);
 struct btd_adapter *adapter_find_by_id(int id);
 struct btd_adapter *adapter_get_default(void);
 void adapter_foreach(adapter_cb func, gpointer user_data);
-struct btd_adapter *adapter_register(int id, bool powered, bool connectable,
-							bool discoverable);
+struct btd_adapter *adapter_register(int id, uint32_t settings);
 int adapter_unregister(int id);
 
 void btd_adapter_start(struct btd_adapter *adapter);
diff --git a/src/mgmt.c b/src/mgmt.c
index 1a22982ce..105fc3064 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -1178,10 +1178,7 @@ static void read_info_complete(uint16_t index, void *buf, size_t len)
 
 	clear_uuids(index);
 
-	adapter = adapter_register(index, mgmt_powered(info->current_settings),
-				mgmt_connectable(info->current_settings),
-				mgmt_discoverable(info->current_settings));
-
+	adapter = adapter_register(index, info->current_settings);
 	if (adapter == NULL) {
 		error("mgmt: unable to register adapter");
 		return;
-- 
2.47.3