From 7f631a1e10a3a7054d5e421e2fea4b98a9b8189b Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 2 Apr 2015 21:45:40 -0700
Subject: [PATCH] tools: Print bus information from extended index list

---
 tools/btmgmt.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index d7af7f08a..1ac2164dd 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -1474,12 +1474,14 @@ static void ext_index_rsp(uint8_t status, uint16_t len, const void *param,
 
 	for (i = 0; i < count; i++) {
 		uint16_t index = le16_to_cpu(rp->entry[i].index);
+		char *busstr = hci_bustostr(rp->entry[i].bus);
 
 		if (index_filter != MGMT_INDEX_NONE && index_filter != index)
 			continue;
 
 		switch (rp->entry[i].type) {
 		case 0x00:
+			print("Primary controller (hci%u,%s)", index, busstr);
 			if (!mgmt_send(mgmt, MGMT_OP_READ_INFO,
 						index, 0, NULL, info_rsp,
 						UINT_TO_PTR(index), NULL)) {
@@ -1489,6 +1491,8 @@ static void ext_index_rsp(uint8_t status, uint16_t len, const void *param,
 			pending_index++;
 			break;
 		case 0x01:
+			print("Unconfigured controller (hci%u,%s)",
+								index, busstr);
 			if (!mgmt_send(mgmt, MGMT_OP_READ_CONFIG_INFO,
 						index, 0, NULL, config_info_rsp,
 						UINT_TO_PTR(index), NULL)) {
@@ -1498,16 +1502,17 @@ static void ext_index_rsp(uint8_t status, uint16_t len, const void *param,
 			pending_index++;
 			break;
 		case 0x02:
-			print("hci%u:\tAMP controller (%u)", index,
-							rp->entry[i].bus);
+			print("AMP controller (hci%u,%s)", index, busstr);
 			break;
 		default:
-			print("hci%u:\tType %u controller (%u)", index,
-					rp->entry[i].type, rp->entry[i].bus);
+			print("Type %u controller (hci%u,%s)",
+					rp->entry[i].type, index, busstr);
 			break;
 		}
 	}
 
+	print("");
+
 	if (!count)
 		noninteractive_quit(EXIT_SUCCESS);
 }
-- 
2.47.3