From 2e2600da8480d5ec7c2ac8aa18816feefee0f505 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 4 Jan 2013 14:36:01 -0800 Subject: [PATCH] core: Use index for tracking controller info and not its address --- src/mgmt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mgmt.c b/src/mgmt.c index a787605ee..ef93b9880 100644 --- a/src/mgmt.c +++ b/src/mgmt.c @@ -56,7 +56,6 @@ static int max_index = -1; static struct controller_info { gboolean valid; - bdaddr_t bdaddr; uint32_t supported_settings; uint32_t current_settings; GSList *connections; @@ -860,7 +859,6 @@ static void read_info_complete(uint16_t index, void *buf, size_t len) { struct mgmt_rp_read_info *rp = buf; struct controller_info *info; - char addr[18]; if (len < sizeof(*rp)) { error("Too small read info complete event"); @@ -874,16 +872,13 @@ static void read_info_complete(uint16_t index, void *buf, size_t len) info = &controllers[index]; - bacpy(&info->bdaddr, &rp->bdaddr); - memcpy(&info->supported_settings, &rp->supported_settings, sizeof(info->supported_settings)); memcpy(&info->current_settings, &rp->current_settings, sizeof(info->current_settings)); - ba2str(&info->bdaddr, addr); - DBG("hci%u addr %s version %u manufacturer %u class 0x%02x%02x%02x\n", - index, addr, rp->version, bt_get_le16(&rp->manufacturer), + DBG("hci%u version %u manufacturer %u class 0x%02x%02x%02x\n", + index, rp->version, bt_get_le16(&rp->manufacturer), rp->dev_class[2], rp->dev_class[1], rp->dev_class[0]); DBG("hci%u settings", index); DBG("hci%u name %s", index, (char *) rp->name); -- 2.47.3