monitor: Rename big_id field to handle
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 24 Feb 2021 23:26:15 +0000 (15:26 -0800)
committerAyush Garg <ayush.garg@samsung.com>
Fri, 11 Mar 2022 13:38:34 +0000 (19:08 +0530)
This avoids prefixing with big when it is implied by the struct name.

Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>
monitor/bt.h
monitor/packet.c

index b911e86..31f055d 100755 (executable)
@@ -2686,7 +2686,7 @@ struct bt_hci_bis {
 } __attribute__ ((packed));
 
 struct bt_hci_cmd_le_create_big {
-       uint8_t  big_id;
+       uint8_t  handle;
        uint8_t  adv_handle;
        uint8_t  num_bis;
        struct bt_hci_bis bis[0];
@@ -3528,7 +3528,7 @@ struct bt_hci_evt_le_cis_req {
 #define BT_HCI_EVT_LE_BIG_COMPLETE             0x1b
 struct bt_hci_evt_le_big_complete {
        uint8_t  status;
-       uint8_t  big_id;
+       uint8_t  handle;
        uint8_t  sync_delay[3];
        uint8_t  latency[3];
        uint8_t  phy;
@@ -3539,7 +3539,7 @@ struct bt_hci_evt_le_big_complete {
        uint16_t max_pdu;
        uint16_t interval;
        uint8_t  num_bis;
-       uint16_t handle[0];
+       uint16_t bis_handle[0];
 } __attribute__ ((packed));
 
 #define BT_HCI_EVT_LE_BIG_TERMINATE            0x1c
index 2e59cf2..c415c9b 100755 (executable)
@@ -7990,7 +7990,7 @@ static void le_create_big_cmd(const void *data, uint8_t size)
 {
        const struct bt_hci_cmd_le_create_big *cmd = data;
 
-       print_field("BIG ID: 0x%2.2x", cmd->big_id);
+       print_field("Handle: 0x%2.2x", cmd->handle);
        print_field("Advertising Handle: 0x%2.2x", cmd->adv_handle);
        print_field("Number of BIS: %u", cmd->num_bis);
 
@@ -10577,7 +10577,7 @@ static void le_big_complete_evt(const void *data, uint8_t size)
        const struct bt_hci_evt_le_big_complete *evt = data;
 
        print_status(evt->status);
-       print_field("BIG ID: 0x%2.2x", evt->big_id);
+       print_field("Handle: 0x%2.2x", evt->handle);
        print_usec_interval("BIG Synchronization Delay", evt->sync_delay);
        print_usec_interval("Transport Latency", evt->latency);
        print_le_phy("PHY", evt->phy);
@@ -10587,8 +10587,8 @@ static void le_big_complete_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_bis_handle);
+       print_list(evt->bis_handle, size, evt->num_bis,
+                       sizeof(*evt->bis_handle), print_bis_handle);
 }
 
 static void le_big_terminate_evt(const void *data, uint8_t size)