Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   =?UTF-8?q?=C5=81ukasz=20Rymanowski?= 
        <lukasz.rymanowski@codecoup.pl>
To:     linux-bluetooth@vger.kernel.org
Cc:     =?UTF-8?q?=C5=81ukasz=20Rymanowski?= 
        <lukasz.rymanowski@codecoup.pl>
Subject: [PATCH BlueZ 4/4] btmon: Make BIG identifier consistent
Date:   Fri, 21 Jul 2023 14:03:20 +0200
Message-Id: <20230721120320.147496-5-lukasz.rymanowski@codecoup.pl>
In-Reply-To: <20230721120320.147496-1-lukasz.rymanowski@codecoup.pl>
References: <20230721120320.147496-1-lukasz.rymanowski@codecoup.pl>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Bluetooth spec uses BIG Handle as a BIG identifier.
Btmon sometimes use this and sometimes BIG ID.
This patch makes code consistent
---
 monitor/bt.h     | 4 ++--
 monitor/packet.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/monitor/bt.h b/monitor/bt.h
index ea24a076e..b60263fa0 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -2789,7 +2789,7 @@ struct bt_hci_bis_test {
 } __attribute__ ((packed));
 
 struct bt_hci_cmd_le_create_big_test {
-	uint8_t  big_id;
+	uint8_t  big_handle;
 	uint8_t  adv_handle;
 	uint8_t  num_bis;
 	struct bt_hci_bis_test bis[0];
@@ -3676,7 +3676,7 @@ struct bt_hci_evt_le_big_sync_estabilished {
 
 #define BT_HCI_EVT_LE_BIG_SYNC_LOST		0x1e
 struct bt_hci_evt_le_big_sync_lost {
-	uint8_t  big_id;
+	uint8_t  big_handle;
 	uint8_t  reason;
 } __attribute__ ((packed));
 
diff --git a/monitor/packet.c b/monitor/packet.c
index fd1e9e034..f581a8e72 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -8811,7 +8811,7 @@ static void le_create_big_cmd_test_cmd(uint16_t index, const void *data,
 {
 	const struct bt_hci_cmd_le_create_big_test *cmd = data;
 
-	print_field("BIG ID: 0x%2.2x", cmd->big_id);
+	print_field("BIG Handle: 0x%2.2x", cmd->big_handle);
 	print_field("Advertising Handle: 0x%2.2x", cmd->adv_handle);
 	print_field("Number of BIS: %u", cmd->num_bis);
 
@@ -11633,7 +11633,7 @@ static void le_big_sync_lost_evt(struct timeval *tv, uint16_t index,
 {
 	const struct bt_hci_evt_le_big_sync_lost *evt = data;
 
-	print_field("BIG ID: 0x%2.2x", evt->big_id);
+	print_field("BIG Handle: 0x%2.2x", evt->big_handle);
 	print_reason(evt->reason);
 }
 
-- 
2.34.1