From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> Handle read info complete callback from mgmt interface. --- Makefile.android | 3 +- android/Android.mk | 1 + android/adapter.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ android/adapter.h | 4 +++ android/main.c | 27 ++++++++++------- 5 files changed, 107 insertions(+), 12 deletions(-) diff --git a/Makefile.android b/Makefile.android index 4d7da39..11eadc2 100644 --- a/Makefile.android +++ b/Makefile.android @@ -7,7 +7,8 @@ android_bluetoothd_SOURCES = android/main.c \ src/sdpd-database.c src/sdpd-server.c \ src/sdpd-service.c src/sdpd-request.c \ src/shared/util.h src/shared/util.c \ - src/shared/mgmt.h src/shared/mgmt.c + src/shared/mgmt.h src/shared/mgmt.c \ + android/adapter.h android/adapter.c android_bluetoothd_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@ endif diff --git a/android/Android.mk b/android/Android.mk index 560fb0a..821f1dc 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -15,6 +15,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ main.c \ log.c \ + adapter.c \ ../src/shared/mgmt.c \ ../src/shared/util.c \ ../src/sdpd-database.c \ diff --git a/android/adapter.c b/android/adapter.c index 9763530..a660ed0 100644 --- a/android/adapter.c +++ b/android/adapter.c @@ -21,14 +21,25 @@ * */ +#include "lib/bluetooth.h" #include "src/shared/mgmt.h" +#include "lib/mgmt.h" #include "log.h" #include "adapter.h" struct bt_adapter { struct mgmt *mgmt; + bdaddr_t bdaddr; + uint32_t dev_class; + + char *name; + + uint32_t supported_settings; + uint32_t current_settings; }; +extern struct bt_adapter *default_adapter; + struct bt_adapter *bt_adapter_new(uint16_t index, struct mgmt *mgmt_if) { struct bt_adapter *adapter; @@ -52,3 +63,76 @@ void bt_adapter_stop(struct bt_adapter *adapter) { DBG(""); } + +static void load_link_keys_complete(uint8_t status, uint16_t length, + const void *param, void *user_data) +{ + DBG("status %u", status); +} + +void load_link_keys(struct bt_adapter *adapter, GSList *keys) +{ + struct mgmt_cp_load_link_keys *cp; + size_t key_len = g_slist_length(keys); + struct mgmt_link_key_info *key; + size_t len; + + DBG(""); + + len = sizeof(*cp) + key_len * sizeof(*key); + cp = g_malloc0(len); + + cp->debug_keys = 0; + cp->key_count = htobs(key_len); + + mgmt_send(adapter->mgmt, MGMT_OP_LOAD_LINK_KEYS, 0, len, + cp, load_link_keys_complete, adapter, NULL); + + free(cp); +} + +void read_info_complete(uint8_t status, uint16_t length, const void *param, + void *user_data) +{ + struct bt_adapter *adapter = user_data; + const struct mgmt_rp_read_info *rp = param; + + DBG(""); + + if (status) { + error("Failed to read info for index %u: %s (0x%02x)", + 0, mgmt_errstr(status), status); + goto failed; + } + + if (length < sizeof(*rp)) { + error("Too small read info complete response"); + goto failed; + } + + if (!bacmp(&rp->bdaddr, BDADDR_ANY)) { + error("No Bluetooth address"); + goto failed; + } + + /* Store adapter information */ + bacpy(&adapter->bdaddr, &rp->bdaddr); + adapter->dev_class = rp->dev_class[0] | (rp->dev_class[1] << 8) | + (rp->dev_class[2] << 16); + adapter->name = g_strdup((const char *) rp->name); + + adapter->supported_settings = btohs(rp->supported_settings); + adapter->current_settings = btohs(rp->current_settings); + + /* TODO: Register all event notification handlers */ + + if (adapter->current_settings & MGMT_SETTING_POWERED) + bt_adapter_start(adapter); + + load_link_keys(adapter, NULL); + + return; + +failed: + default_adapter = NULL; +} diff --git a/android/adapter.h b/android/adapter.h index 0f1445a..3025f89 100644 --- a/android/adapter.h +++ b/android/adapter.h @@ -34,3 +34,7 @@ struct bt_adapter *bt_adapter_new(uint16_t index, struct mgmt *mgmt_if); void bt_adapter_start(struct bt_adapter *adapter); void bt_adapter_stop(struct bt_adapter *adapter); + +void read_info_complete(uint8_t status, uint16_t length, const void *param, + void *user_data); +void load_link_keys(struct bt_adapter *adapter, GSList *keys); diff --git a/android/main.c b/android/main.c index 2eecec9..0747a0e 100644 --- a/android/main.c +++ b/android/main.c @@ -57,6 +57,8 @@ #include "lib/mgmt.h" #include "src/shared/mgmt.h" +#include "adapter.h" + #define SHUTDOWN_GRACE_SECONDS 10 static GMainLoop *event_loop; @@ -65,6 +67,8 @@ static struct mgmt *mgmt_if = NULL; static uint8_t mgmt_version = 0; static uint8_t mgmt_revision = 0; +struct bt_adapter *default_adapter = NULL; + static gboolean quit_eventloop(gpointer user_data) { g_main_loop_quit(event_loop); @@ -92,26 +96,27 @@ static GOptionEntry options[] = { { NULL } }; -static void read_info_complete(uint8_t status, uint16_t length, - const void *param, void *user_data) -{ - /* TODO: Store Controller information */ - - /* TODO: Register all event notification handlers */ -} - - static void mgmt_index_added_event(uint16_t index, uint16_t length, const void *param, void *user_data) { DBG("index %u", index); + if (default_adapter) { + DBG("skip event for index %d", index); + return; + } + + default_adapter = bt_adapter_new(index, mgmt_if); + if (default_adapter == NULL) { + error("Unable to create new adapter for index %u", index); + return; + } + if (mgmt_send(mgmt_if, MGMT_OP_READ_INFO, index, 0, NULL, - read_info_complete, NULL, NULL) > 0) + read_info_complete, default_adapter, NULL) > 0) return; error("Failed to read adapter info for index %u", index); - } static void mgmt_index_removed_event(uint16_t index, uint16_t length, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html