From c8b12d2c7417136cc586bdf4119260dacc5b973e Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 24 Feb 2021 15:26:15 -0800 Subject: [PATCH] monitor: Rename big_id field to handle This avoids prefixing with big when it is implied by the struct name. --- monitor/bt.h | 6 +++--- monitor/packet.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monitor/bt.h b/monitor/bt.h index a77a2ee60..d00dabed1 100644 --- a/monitor/bt.h +++ b/monitor/bt.h @@ -2687,7 +2687,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]; @@ -3529,7 +3529,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; @@ -3540,7 +3540,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 diff --git a/monitor/packet.c b/monitor/packet.c index c07676253..482e82703 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -7996,7 +7996,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); @@ -10571,7 +10571,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); @@ -10581,8 +10581,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) -- 2.47.3