[Bluez PATCH 18/62] monitor: Inclusive language in peripheral page response timeout
From: Archie Pusaka <hidden>
Date: 2021-08-13 12:20:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Archie Pusaka <redacted> "peripheral" is preferred, as reflected in the BT core spec 5.3. --- monitor/bt.h | 2 +- monitor/packet.c | 8 ++++---- tools/3dsp.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/monitor/bt.h b/monitor/bt.h
index 4aa11e53a5..3144c25ff0 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h@@ -3348,7 +3348,7 @@ struct bt_hci_evt_truncated_page_complete { uint8_t bdaddr[6]; } __attribute__ ((packed)); -#define BT_HCI_EVT_SLAVE_PAGE_RESPONSE_TIMEOUT 0x54 +#define BT_HCI_EVT_PERIPHERAL_PAGE_RESPONSE_TIMEOUT 0x54 #define BT_HCI_EVT_PERIPHERAL_BROADCAST_CHANNEL_MAP_CHANGE 0x55 struct bt_hci_evt_peripheral_broadcast_channel_map_change {
diff --git a/monitor/packet.c b/monitor/packet.c
index a787cb2854..55f275ab3a 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c@@ -2985,7 +2985,7 @@ static const struct bitfield_data events_page2_table[] = { { 17, "Connectionless Peripheral Broadcast Receive" }, { 18, "Connectionless Peripheral Broadcast Timeout" }, { 19, "Truncated Page Complete" }, - { 20, "Slave Page Response Timeout" }, + { 20, "Peripheral Page Response Timeout" }, { 21, "Connectionless Peripheral Broadcast Channel Map Change" }, { 22, "Inquiry Response Notification" }, { 23, "Authenticated Payload Timeout Expired" },
@@ -10238,7 +10238,7 @@ static void truncated_page_complete_evt(const void *data, uint8_t size) print_bdaddr(evt->bdaddr); } -static void slave_page_response_timeout_evt(const void *data, uint8_t size) +static void peripheral_page_response_timeout_evt(const void *data, uint8_t size) { }
@@ -11197,8 +11197,8 @@ static const struct event_data event_table[] = { peripheral_broadcast_timeout_evt, 7, true }, { 0x53, "Truncated Page Complete", truncated_page_complete_evt, 7, true }, - { 0x54, "Slave Page Response Timeout", - slave_page_response_timeout_evt, 0, true }, + { 0x54, "Peripheral Page Response Timeout", + peripheral_page_response_timeout_evt, 0, true }, { 0x55, "Connectionless Peripheral Broadcast Channel Map Change", peripheral_broadcast_channel_map_change_evt, 10, true }, { 0x56, "Inquiry Response Notification",
diff --git a/tools/3dsp.c b/tools/3dsp.c
index 4dd53478e1..5227c30b63 100644
--- a/tools/3dsp.c
+++ b/tools/3dsp.c@@ -492,7 +492,7 @@ static void start_display(void) bt_hci_register(hci_dev, BT_HCI_EVT_CONN_REQUEST, conn_request, NULL, NULL); - bt_hci_register(hci_dev, BT_HCI_EVT_SLAVE_PAGE_RESPONSE_TIMEOUT, + bt_hci_register(hci_dev, BT_HCI_EVT_PERIPHERAL_PAGE_RESPONSE_TIMEOUT, slave_page_response_timeout, NULL, NULL); bt_hci_register(hci_dev, BT_HCI_EVT_PERIPHERAL_BROADCAST_CHANNEL_MAP_CHANGE,
--
2.33.0.rc1.237.g0d66db33f3-goog