Diff between 986aaa2bb8b163f2d7d6d253d2576ec8c1cabeb7 and 53c54b858cbaa842bfc25b47cf55fb289051bc3a

Changed Files

File Additions Deletions Status
monitor/bt.h +5 -5 modified
monitor/packet.c +5 -5 modified

Full Patch

diff --git a/monitor/bt.h b/monitor/bt.h
index 84bf50a..39110b0 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -2722,7 +2722,7 @@ struct bt_hci_cmd_le_create_big_test {
 #define BT_HCI_CMD_LE_TERM_BIG			0x206a
 #define BT_HCI_BIT_LE_TERM_BIG			BT_HCI_CMD_BIT(42, 7)
 struct bt_hci_cmd_le_term_big {
-	uint8_t  big_id;
+	uint8_t  handle;
 	uint8_t  reason;
 } __attribute__ ((packed));
 
@@ -2745,7 +2745,7 @@ struct bt_hci_cmd_le_big_create_sync {
 #define BT_HCI_CMD_LE_BIG_TERM_SYNC		0x206c
 #define BT_HCI_BIT_LE_BIG_TERM_SYNC		BT_HCI_CMD_BIT(43, 1)
 struct bt_hci_cmd_le_big_term_sync {
-	uint8_t  big_id;
+	uint8_t  handle;
 } __attribute__ ((packed));
 
 #define BT_HCI_CMD_LE_REQ_PEER_SCA		0x206d
@@ -3546,13 +3546,13 @@ struct bt_hci_evt_le_big_complete {
 #define BT_HCI_EVT_LE_BIG_TERMINATE			0x1c
 struct bt_hci_evt_le_big_terminate {
 	uint8_t  reason;
-	uint8_t  big_id;
+	uint8_t  handle;
 } __attribute__ ((packed));
 
 #define BT_HCI_EVT_LE_BIG_SYNC_ESTABILISHED		0x1d
 struct bt_hci_evt_le_big_sync_estabilished {
 	uint8_t  status;
-	uint8_t  big_id;
+	uint8_t  handle;
 	uint8_t  latency[3];
 	uint8_t  nse;
 	uint8_t  bn;
@@ -3561,7 +3561,7 @@ struct bt_hci_evt_le_big_sync_estabilished {
 	uint16_t max_pdu;
 	uint16_t interval;
 	uint8_t  num_bis;
-	uint16_t handle[0];
+	uint16_t bis[0];
 } __attribute__ ((packed));
 
 #define BT_HCI_EVT_LE_BIG_SYNC_LOST			0x1e
diff --git a/monitor/packet.c b/monitor/packet.c
index 63d9afe..87cb0f7 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -8044,7 +8044,7 @@ static void le_terminate_big_cmd(const void *data, uint8_t size)
 {
 	const struct bt_hci_cmd_le_term_big *cmd = data;
 
-	print_field("BIG ID: 0x%2.2x", cmd->big_id);
+	print_field("BIG Handle: 0x%2.2x", cmd->handle);
 	print_reason(cmd->reason);
 }
 
@@ -8080,7 +8080,7 @@ static void le_big_term_sync_cmd(const void *data, uint8_t size)
 {
 	const struct bt_hci_cmd_le_big_term_sync *cmd = data;
 
-	print_field("BIG ID: 0x%2.2x", cmd->big_id);
+	print_field("BIG Handle: 0x%2.2x", cmd->handle);
 }
 
 static void print_iso_dir(const char *prefix, uint8_t dir)
@@ -10592,8 +10592,8 @@ static void le_big_terminate_evt(const void *data, uint8_t size)
 {
 	const struct bt_hci_evt_le_big_terminate *evt = data;
 
+	print_field("BIG Handle: 0x%2.2x", evt->handle);
 	print_reason(evt->reason);
-	print_field("BIG ID: 0x%2.2x", evt->big_id);
 }
 
 static void le_big_sync_estabilished_evt(const void *data, uint8_t size)
@@ -10601,7 +10601,7 @@ static void le_big_sync_estabilished_evt(const void *data, uint8_t size)
 	const struct bt_hci_evt_le_big_sync_estabilished *evt = data;
 
 	print_status(evt->status);
-	print_field("BIG ID: 0x%2.2x", evt->big_id);
+	print_field("BIG Handle: 0x%2.2x", evt->handle);
 	print_usec_interval("Transport Latency", evt->latency);
 	print_field("NSE: %u", evt->nse);
 	print_field("BN: %u", evt->bn);
@@ -10609,7 +10609,7 @@ static void le_big_sync_estabilished_evt(const void *data, uint8_t size)
 	print_field("IRC: %u", evt->irc);
 	print_field("Maximum PDU: %u", evt->max_pdu);
 	print_slot_125("ISO Interval", evt->interval);
-	print_list(evt->handle, size, evt->num_bis, sizeof(*evt->handle),
+	print_list(evt->bis, size, evt->num_bis, sizeof(*evt->bis),
 						print_bis_handle);
 }