[Bluez,19/62] monitor: Inclusive language in consts and strings

Message ID	20210813201256.Bluez.19.Ie6d2c61363aea99e926343e7b4f6123062d00f83@changeid (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-bluetooth-owner@kernel.org> Date: Fri, 13 Aug 2021 20:18:04 +0800 In-Reply-To: <20210813121848.3686029-1-apusaka@google.com> Message-Id: <20210813201256.Bluez.19.Ie6d2c61363aea99e926343e7b4f6123062d00f83@changeid> Mime-Version: 1.0 References: <20210813121848.3686029-1-apusaka@google.com> Subject: [Bluez PATCH 19/62] monitor: Inclusive language in consts and strings From: Archie Pusaka <apusaka@google.com> To: linux-bluetooth <linux-bluetooth@vger.kernel.org>, Luiz Augusto von Dentz <luiz.dentz@gmail.com> Cc: CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>, Archie Pusaka <apusaka@chromium.org> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	Inclusive language changes \| expand [Bluez,00/62] Inclusive language changes [Bluez,01/62] lib: Inclusive language in HCI commands and events [Bluez,02/62] lib: Inclusive language in consts and strings [Bluez,03/62] tools/hciconfig: Inclusive language update [Bluez,04/62] core: Inclusive language for l2cap [Bluez,05/62] core: Inclusive language for rfcomm [Bluez,06/62] lib: Inclusive language for filtering devices [Bluez,07/62] lib/mgmt: Inclusive language for LTK [Bluez,08/62] doc/mgmt: Inclusive language update [Bluez,09/62] btio: Inclusive language changes [Bluez,10/62] shared/ad: Inclusive language changes [Bluez,11/62] shared/hfp: Inclusive language changes [Bluez,12/62] monitor: Inclusive language in struct member [Bluez,13/62] monitor: Inclusive language in SMP related things [Bluez,14/62] monitor: Inclusive language in LE states [Bluez,15/62] monitor: Inclusive language in LL feature [Bluez,16/62] monitor: Inclusive language in link key transaction [Bluez,17/62] monitor: Inclusive language in peripheral broadcast [Bluez,18/62] monitor: Inclusive language in peripheral page response timeout [Bluez,19/62] monitor: Inclusive language in consts and strings [Bluez,20/62] monitor: Inclusive language in filtering devices [Bluez,21/62] emulator: Inclusive language in naming [Bluez,22/62] emulator: Inclusive language in strings [Bluez,23/62] emulator: Inclusive language in filtering device [Bluez,24/62] tools: Inclusive language in referring the central address [Bluez,25/62] tools/parser/hci: Inclusive language changes [Bluez,26/62] tools/parser/smp: Inclusive language changes [Bluez,27/62] tools/3dsp: Inclusive language changes [Bluez,28/62] tools/mgmt-tester: Inclusive language changes [Bluez,29/62] tools/bdaddr: Inclusive language changes [Bluez,30/62] tools/hciconfig: Inclusive language changes [Bluez,31/62] tools/meshctl: Inclusive language changes [Bluez,32/62] tools/mgmt-tester: Inclusive language changes [Bluez,33/62] tools/parser: Inclusive language in struct member [Bluez,34/62] tools/parser/lmp: Inclusive language changes [Bluez,35/62] tools/parser/avdtp: Inclusive language changes [Bluez,36/62] tools/parser/csr: Inclusive language changes [Bluez,37/62] tools/btpclientctl: Inclusive language changes [Bluez,38/62] tools/l2cap-tester: Inclusive language changes [Bluez,39/62] tools/hci-tester: Inclusive language changes [Bluez,40/62] tools/btiotest: Inclusive language changes [Bluez,41/62] tools/hcitool: Inclusive language changes, central peripheral [Bluez,42/62] tools/hcitool: Inclusive language changes, accept list [Bluez,43/62] tools/l2test: Inclusive language changes [Bluez,44/62] tools/rctest: Inclusive language changes [Bluez,45/62] tools/rfcomm: Inclusive language changes [Bluez,46/62] plugins/sixaxis: Inclusive language changes [Bluez,47/62] profiles/audio: Inclusive language changes [Bluez,48/62] profiles/health: Inclusive language changes [Bluez,49/62] sdp: Inclusive language changes [Bluez,50/62] adapter: Inclusive language for central and peripheral [Bluez,51/62] adapter: Inclusive language for storing LTK [Bluez,52/62] adapter: Inclusive language for device filtering [Bluez,53/62] client: Inclusive language changes [Bluez,54/62] mesh: Inclusive language changes [Bluez,55/62] tools/mesh: Inclusive language changes [Bluez,56/62] tools/mesh-gatt: Inclusive language changes [Bluez,57/62] unit/mesh: Inclusive language changes [Bluez,58/62] doc/mesh: Inclusive language changes [Bluez,59/62] android: Inclusive language for volume control [Bluez,60/62] android: Inclusive language for describing relation [Bluez,61/62] android: Inclusive language for filtering devices [Bluez,62/62] android: Inclusive language in storing LTK

diff --git a/monitor/broadcom.c b/monitor/broadcom.c index b144032c3e..e30116735b 100644 --- a/monitor/broadcom.c +++ b/monitor/broadcom.c @@ -120,10 +120,10 @@ static void print_sync_mode(uint8_t mode) switch (mode) { case 0x00: - str = "Slave"; + str = "Peripheral"; break; case 0x01: - str = "Master"; + str = "Central"; break; default: str = "Reserved"; @@ -139,10 +139,10 @@ static void print_clock_mode(uint8_t mode) switch (mode) { case 0x00: - str = "Slave"; + str = "Peripheral"; break; case 0x01: - str = "Master"; + str = "Central"; break; default: str = "Reserved"; diff --git a/monitor/control.c b/monitor/control.c index 97d7e789c4..fac1f8e1ff 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -305,19 +305,19 @@ static void mgmt_new_long_term_key(uint16_t len, const void *buf) return; } - /* LE SC keys are both for master and slave */ + /* LE SC keys are both for central and peripheral */ switch (ev->key.type) { case 0x00: if (ev->key.central) - type = "Master (Unauthenticated)"; + type = "Central (Unauthenticated)"; else - type = "Slave (Unauthenticated)"; + type = "Peripheral (Unauthenticated)"; break; case 0x01: if (ev->key.central) - type = "Master (Authenticated)"; + type = "Central (Authenticated)"; else - type = "Slave (Authenticated)"; + type = "Peripheral (Authenticated)"; break; case 0x02: type = "SC (Unauthenticated)"; diff --git a/monitor/l2cap.c b/monitor/l2cap.c index 109bc16b44..646f0f66cb 100644 --- a/monitor/l2cap.c +++ b/monitor/l2cap.c @@ -1280,7 +1280,7 @@ static void sig_conn_param_req(const struct l2cap_frame *frame) print_field("Min interval: %d", le16_to_cpu(pdu->min_interval)); print_field("Max interval: %d", le16_to_cpu(pdu->max_interval)); - print_field("Slave latency: %d", le16_to_cpu(pdu->latency)); + print_field("Peripheral latency: %d", le16_to_cpu(pdu->latency)); print_field("Timeout multiplier: %d", le16_to_cpu(pdu->timeout)); } diff --git a/monitor/ll.c b/monitor/ll.c index d0db9194bd..f588d5e992 100644 --- a/monitor/ll.c +++ b/monitor/ll.c @@ -186,7 +186,7 @@ static void advertising_packet(const void *data, uint8_t size) print_field("Transmit window size: %u", win_size); print_field("Transmit window offset: %u", win_offset); print_field("Connection interval: %u", interval); - print_field("Connection slave latency: %u", latency); + print_field("Connection peripheral latency: %u", latency); print_field("Connection supervision timeout: %u", timeout); packet_print_channel_map_ll(ptr + 30); @@ -371,8 +371,10 @@ static void conn_update_req(const void *data, uint8_t size) print_field("Transmit window size: %u", pdu->win_size); print_field("Transmit window offset: %u", le16_to_cpu(pdu->win_offset)); print_field("Connection interval: %u", le16_to_cpu(pdu->interval)); - print_field("Connection slave latency: %u", le16_to_cpu(pdu->latency)); - print_field("Connection supervision timeout: %u", le16_to_cpu(pdu->timeout)); + print_field("Connection peripheral latency: %u", + le16_to_cpu(pdu->latency)); + print_field("Connection supervision timeout: %u", + le16_to_cpu(pdu->timeout)); print_field("Connection instant: %u", le16_to_cpu(pdu->instant)); } @@ -397,16 +399,16 @@ static void enc_req(const void *data, uint8_t size) print_field("Rand: 0x%16.16" PRIx64, le64_to_cpu(pdu->rand)); print_field("EDIV: 0x%4.4x", le16_to_cpu(pdu->ediv)); - print_field("SKD (master): 0x%16.16" PRIx64, le64_to_cpu(pdu->skd)); - print_field("IV (master): 0x%8.8x", le32_to_cpu(pdu->iv)); + print_field("SKD (central): 0x%16.16" PRIx64, le64_to_cpu(pdu->skd)); + print_field("IV (central): 0x%8.8x", le32_to_cpu(pdu->iv)); } static void enc_rsp(const void *data, uint8_t size) { const struct bt_ll_enc_rsp *pdu = data; - print_field("SKD (slave): 0x%16.16" PRIx64, le64_to_cpu(pdu->skd)); - print_field("IV (slave): 0x%8.8x", le32_to_cpu(pdu->iv)); + print_field("SKD (peripheral): 0x%16.16" PRIx64, le64_to_cpu(pdu->skd)); + print_field("IV (peripheral): 0x%8.8x", le32_to_cpu(pdu->iv)); } static const char *opcode_to_string(uint8_t opcode); @@ -505,14 +507,14 @@ static void phy_update_ind(const void *data, uint8_t size) const struct bt_ll_phy_update_ind *pdu = data; uint8_t mask; - print_field("M_TO_S_PHY: 0x%2.2x", pdu->c_phy); + print_field("C_TO_P_PHY: 0x%2.2x", pdu->c_phy); mask = print_bitfield(2, pdu->c_phy, le_phys); if (mask) print_text(COLOR_UNKNOWN_OPTIONS_BIT, " Reserved" " (0x%2.2x)", mask); - print_field("S_TO_M_PHY: 0x%2.2x", pdu->p_phy); + print_field("P_TO_C_PHY: 0x%2.2x", pdu->p_phy); mask = print_bitfield(2, pdu->p_phy, le_phys); if (mask) @@ -596,38 +598,40 @@ static void cis_req(const void *data, uint8_t size) print_field("CIG ID: 0x%2.2x", cmd->cig); print_field("CIS ID: 0x%2.2x", cmd->cis); - print_field("Master to Slave PHY: 0x%2.2x", cmd->c_phy); + print_field("Central to Peripheral PHY: 0x%2.2x", cmd->c_phy); mask = print_bitfield(2, cmd->c_phy, le_phys); if (mask) print_text(COLOR_UNKNOWN_OPTIONS_BIT, " Reserved" " (0x%2.2x)", mask); - print_field("Slave To Master PHY: 0x%2.2x", cmd->p_phy); + print_field("Peripheral To Central PHY: 0x%2.2x", cmd->p_phy); mask = print_bitfield(2, cmd->p_phy, le_phys); if (mask) print_text(COLOR_UNKNOWN_OPTIONS_BIT, " Reserved" " (0x%2.2x)", mask); - print_field("Master to Slave Maximum SDU: %u", cmd->c_sdu); - print_field("Slave to Master Maximum SDU: %u", cmd->p_sdu); + print_field("Central to Peripheral Maximum SDU: %u", cmd->c_sdu); + print_field("Peripheral to Central Maximum SDU: %u", cmd->p_sdu); memcpy(&interval, cmd->c_interval, sizeof(cmd->c_interval)); - print_field("Master to Slave Interval: 0x%6.6x", le32_to_cpu(interval)); + print_field("Central to Peripheral Interval: 0x%6.6x", + le32_to_cpu(interval)); memcpy(&interval, cmd->p_interval, sizeof(cmd->p_interval)); - print_field("Slave to Master Interval: 0x%6.6x", le32_to_cpu(interval)); + print_field("Peripheral to Central Interval: 0x%6.6x", + le32_to_cpu(interval)); - print_field("Master to Slave Maximum PDU: %u", cmd->c_pdu); - print_field("Slave to Master Maximum PDU: %u", cmd->p_pdu); + print_field("Central to Peripheral Maximum PDU: %u", cmd->c_pdu); + print_field("Peripheral to Central Maximum PDU: %u", cmd->p_pdu); print_field("Burst Number: %u us", cmd->bn); memcpy(&interval, cmd->sub_interval, sizeof(cmd->sub_interval)); print_field("Sub-Interval: 0x%6.6x", le32_to_cpu(interval)); - print_field("Master to Slave Flush Timeout: %u", cmd->c_ft); - print_field("Slave to Master Flush Timeout: %u", cmd->p_ft); + print_field("Central to Peripheral Flush Timeout: %u", cmd->c_ft); + print_field("Peripheral to Central Flush Timeout: %u", cmd->p_ft); print_field("ISO Interval: 0x%4.4x", le16_to_cpu(cmd->iso_interval)); diff --git a/monitor/lmp.c b/monitor/lmp.c index 0d17f5c986..f6ad3f2568 100644 --- a/monitor/lmp.c +++ b/monitor/lmp.c @@ -839,7 +839,7 @@ void lmp_packet(const void *data, uint8_t size, bool padded) tid = ((const uint8_t *) data)[0] & 0x01; opcode = (((const uint8_t *) data)[0] & 0xfe) >> 1; - tid_str = tid == 0x00 ? "Master" : "Slave"; + tid_str = tid == 0x00 ? "Central" : "Peripheral"; switch (opcode) { case 127: diff --git a/monitor/packet.c b/monitor/packet.c index 55f275ab3a..17da5a08d9 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -2227,10 +2227,10 @@ static void print_role(uint8_t role) switch (role) { case 0x00: - str = "Master"; + str = "Central"; break; case 0x01: - str = "Slave"; + str = "Peripheral"; break; default: str = "Reserved"; @@ -2549,16 +2549,16 @@ static const struct bitfield_data features_page0[] = { { 31, "Extended SCO link (EV3 packets)" }, { 32, "EV4 packets" }, { 33, "EV5 packets" }, - { 35, "AFH capable slave" }, - { 36, "AFH classification slave" }, + { 35, "AFH capable peripheral" }, + { 36, "AFH classification peripheral" }, { 37, "BR/EDR Not Supported" }, { 38, "LE Supported (Controller)" }, { 39, "3-slot Enhanced Data Rate ACL packets" }, { 40, "5-slot Enhanced Data Rate ACL packets" }, { 41, "Sniff subrating" }, { 42, "Pause encryption" }, - { 43, "AFH capable master" }, - { 44, "AFH classification master" }, + { 43, "AFH capable central" }, + { 44, "AFH classification central" }, { 45, "Enhanced Data Rate eSCO 2 Mbps mode" }, { 46, "Enhanced Data Rate eSCO 3 Mbps mode" }, { 47, "3-slot Enhanced Data Rate eSCO packets" }, @@ -2602,7 +2602,7 @@ static const struct bitfield_data features_le[] = { { 0, "LE Encryption" }, { 1, "Connection Parameter Request Procedure" }, { 2, "Extended Reject Indication" }, - { 3, "Slave-initiated Features Exchange" }, + { 3, "Peripheral-initiated Features Exchange" }, { 4, "LE Ping" }, { 5, "LE Data Packet Length Extension" }, { 6, "LL Privacy" }, @@ -2627,8 +2627,8 @@ static const struct bitfield_data features_le[] = { { 25, "Periodic Advertising Sync Transfer - Recipient" }, { 26, "Sleep Clock Accuracy Updates" }, { 27, "Remote Public Key Validation" }, - { 28, "Connected Isochronous Stream - Master" }, - { 29, "Connected Isochronous Stream - Slave" }, + { 28, "Connected Isochronous Stream - Central" }, + { 29, "Connected Isochronous Stream - Peripheral" }, { 30, "Isochronous Broadcaster" }, { 31, "Synchronized Receiver" }, { 32, "Isochronous Channels (Host Support)" }, @@ -2737,11 +2737,11 @@ static const struct bitfield_data le_states_desc_table[] = { { 5, "Active Scanning State" }, { 6, "Passive Scanning State" }, { 7, "Initiating State" }, - { 8, "Connection State (Master Role)" }, - { 9, "Connection State (Slave Role)" }, - { 10, "Master Role & Master Role" }, - { 11, "Slave Role & Slave Role" }, - { 12, "Master Role & Slave Role" }, + { 8, "Connection State (Central Role)" }, + { 9, "Connection State (Peripheral Role)" }, + { 10, "Central Role & Central Role" }, + { 11, "Peripheral Role & Peripheral Role" }, + { 12, "Central Role & Peripheral Role" }, { } }; @@ -3058,7 +3058,7 @@ static void print_fec(uint8_t fec) #define BT_EIR_DEVICE_ID 0x10 #define BT_EIR_SMP_TK 0x10 #define BT_EIR_SMP_OOB_FLAGS 0x11 -#define BT_EIR_SLAVE_CONN_INTERVAL 0x12 +#define BT_EIR_PERIPHERAL_CONN_INTERVAL 0x12 #define BT_EIR_SERVICE_UUID16 0x14 #define BT_EIR_SERVICE_UUID128 0x15 #define BT_EIR_SERVICE_DATA 0x16 @@ -3668,10 +3668,10 @@ static void print_eir(const uint8_t *eir, uint8_t eir_len, bool le) print_field("SMP OOB Flags: 0x%2.2x", *data); break; - case BT_EIR_SLAVE_CONN_INTERVAL: + case BT_EIR_PERIPHERAL_CONN_INTERVAL: if (data_len < 4) break; - print_field("Slave Conn. Interval: 0x%4.4x - 0x%4.4x", + print_field("Peripheral Conn. Interval: 0x%4.4x - 0x%4.4x", get_le16(&data[0]), get_le16(&data[2])); break; @@ -4140,10 +4140,10 @@ static void create_conn_cmd(const void *data, uint8_t size) switch (cmd->role_switch) { case 0x00: - str = "Stay master"; + str = "Stay central"; break; case 0x01: - str = "Allow slave"; + str = "Allow peripheral"; break; default: str = "Reserved"; @@ -8023,15 +8023,15 @@ static void print_cis_params(const void *data, int i) const struct bt_hci_cis_params *cis = data; print_field("CIS ID: 0x%2.2x", cis->cis_id); - print_field("Master to Slave Maximum SDU Size: %u", + print_field("Central to Peripheral Maximum SDU Size: %u", le16_to_cpu(cis->c_sdu)); - print_field("Slave to Master Maximum SDU Size: %u", + print_field("Peripheral to Central Maximum SDU Size: %u", le16_to_cpu(cis->p_sdu)); - print_le_phy("Master to Slave PHY", cis->c_phy); - print_le_phy("Slave to Master PHY", cis->p_phy); - print_field("Master to Slave Retransmission attempts: 0x%2.2x", + print_le_phy("Central to Peripheral PHY", cis->c_phy); + print_le_phy("Peripheral to Central PHY", cis->p_phy); + print_field("Central to Peripheral Retransmission attempts: 0x%2.2x", cis->c_rtn); - print_field("Slave to Master Retransmission attempts: 0x%2.2x", + print_field("Peripheral to Central Retransmission attempts: 0x%2.2x", cis->p_rtn); } @@ -8040,14 +8040,16 @@ static void le_set_cig_params_cmd(const void *data, uint8_t size) const struct bt_hci_cmd_le_set_cig_params *cmd = data; print_field("CIG ID: 0x%2.2x", cmd->cig_id); - print_usec_interval("Master to Slave SDU Interval", cmd->c_interval); - print_usec_interval("Slave to Master SDU Interval", cmd->p_interval); + print_usec_interval("Central to Peripheral SDU Interval", + cmd->c_interval); + print_usec_interval("Peripheral to Central SDU Interval", + cmd->p_interval); print_sca(cmd->sca); print_packing(cmd->packing); print_framing(cmd->framing); - print_field("Master to Slave Maximum Latency: %d ms (0x%4.4x)", + print_field("Central to Peripheral Maximum Latency: %d ms (0x%4.4x)", le16_to_cpu(cmd->c_latency), le16_to_cpu(cmd->c_latency)); - print_field("Slave to Master Maximum Latency: %d ms (0x%4.4x)", + print_field("Peripheral to Central Maximum Latency: %d ms (0x%4.4x)", le16_to_cpu(cmd->p_latency), le16_to_cpu(cmd->p_latency)); print_field("Number of CIS: %u", cmd->num_cis); @@ -8063,16 +8065,16 @@ static void print_cis_params_test(const void *data, int i) print_field("CIS ID: 0x%2.2x", cis->cis_id); print_field("NSE: 0x%2.2x", cis->nse); - print_field("Master to Slave Maximum SDU: 0x%4.4x", cis->c_sdu); - print_field("Slave to Master Maximum SDU: 0x%4.4x", + print_field("Central to Peripheral Maximum SDU: 0x%4.4x", cis->c_sdu); + print_field("Peripheral to Central Maximum SDU: 0x%4.4x", le16_to_cpu(cis->p_sdu)); - print_field("Master to Slave Maximum PDU: 0x%2.2x", + print_field("Central to Peripheral Maximum PDU: 0x%2.2x", le16_to_cpu(cis->c_pdu)); - print_field("Slave to Master Maximum PDU: 0x%2.2x", cis->p_pdu); - print_le_phy("Master to Slave PHY", cis->c_phy); - print_le_phy("Slave to Master PHY", cis->p_phy); - print_field("Master to Slave Burst Number: 0x%2.2x", cis->c_bn); - print_field("Slave to Master Burst Number: 0x%2.2x", cis->p_bn); + print_field("Peripheral to Central Maximum PDU: 0x%2.2x", cis->p_pdu); + print_le_phy("Central to Peripheral PHY", cis->c_phy); + print_le_phy("Peripheral to Central PHY", cis->p_phy); + print_field("Central to Peripheral Burst Number: 0x%2.2x", cis->c_bn); + print_field("Peripheral to Central Burst Number: 0x%2.2x", cis->p_bn); } static void le_set_cig_params_test_cmd(const void *data, uint8_t size) @@ -8080,10 +8082,12 @@ static void le_set_cig_params_test_cmd(const void *data, uint8_t size) const struct bt_hci_cmd_le_set_cig_params_test *cmd = data; print_field("CIG ID: 0x%2.2x", cmd->cig_id); - print_usec_interval("Master to Slave SDU Interval", cmd->c_interval); - print_usec_interval("Master to Slave SDU Interval", cmd->p_interval); - print_field("Master to Slave Flush Timeout: 0x%2.2x", cmd->c_ft); - print_field("Slave to Master Flush Timeout: 0x%2.2x", cmd->p_ft); + print_usec_interval("Central to Peripheral SDU Interval", + cmd->c_interval); + print_usec_interval("Peripheral to Central SDU Interval", + cmd->p_interval); + print_field("Central to Peripheral Flush Timeout: 0x%2.2x", cmd->c_ft); + print_field("Peripheral to Central Flush Timeout: 0x%2.2x", cmd->p_ft); print_field("ISO Interval: %.2f ms (0x%4.4x)", le16_to_cpu(cmd->iso_interval) * 1.25, le16_to_cpu(cmd->iso_interval)); @@ -10279,7 +10283,7 @@ static void le_conn_complete_evt(const void *data, uint8_t size) print_field("Supervision timeout: %d msec (0x%4.4x)", le16_to_cpu(evt->supv_timeout) * 10, le16_to_cpu(evt->supv_timeout)); - print_field("Master clock accuracy: 0x%2.2x", evt->clock_accuracy); + print_field("Central clock accuracy: 0x%2.2x", evt->clock_accuracy); if (evt->status == 0x00) assign_handle(le16_to_cpu(evt->handle), 0x01); @@ -10400,7 +10404,7 @@ static void le_enhanced_conn_complete_evt(const void *data, uint8_t size) print_field("Supervision timeout: %d msec (0x%4.4x)", le16_to_cpu(evt->supv_timeout) * 10, le16_to_cpu(evt->supv_timeout)); - print_field("Master clock accuracy: 0x%2.2x", evt->clock_accuracy); + print_field("Central clock accuracy: 0x%2.2x", evt->clock_accuracy); if (evt->status == 0x00) assign_handle(le16_to_cpu(evt->handle), 0x01); @@ -10776,17 +10780,17 @@ static void le_cis_established_evt(const void *data, uint8_t size) print_field("Connection Handle: %d", le16_to_cpu(evt->conn_handle)); print_usec_interval("CIG Synchronization Delay", evt->cig_sync_delay); print_usec_interval("CIS Synchronization Delay", evt->cis_sync_delay); - print_usec_interval("Master to Slave Latency", evt->c_latency); - print_usec_interval("Slave to Master Latency", evt->p_latency); - print_le_phy("Master to Slave PHY", evt->c_phy); - print_le_phy("Slave to Master PHY", evt->p_phy); + print_usec_interval("Central to Peripheral Latency", evt->c_latency); + print_usec_interval("Peripheral to Central Latency", evt->p_latency); + print_le_phy("Central to Peripheral PHY", evt->c_phy); + print_le_phy("Peripheral to Central PHY", evt->p_phy); print_field("Number of Subevents: %u", evt->nse); - print_field("Master to Slave Burst Number: %u", evt->c_bn); - print_field("Slave to Master Burst Number: %u", evt->p_bn); - print_field("Master to Slave Flush Timeout: %u", evt->c_ft); - print_field("Slave to Master Flush Timeout: %u", evt->p_ft); - print_field("Master to Slave MTU: %u", le16_to_cpu(evt->c_mtu)); - print_field("Slave to Master MTU: %u", le16_to_cpu(evt->p_mtu)); + print_field("Central to Peripheral Burst Number: %u", evt->c_bn); + print_field("Peripheral to Central Burst Number: %u", evt->p_bn); + print_field("Central to Peripheral Flush Timeout: %u", evt->c_ft); + print_field("Peripheral to Central Flush Timeout: %u", evt->p_ft); + print_field("Central to Peripheral MTU: %u", le16_to_cpu(evt->c_mtu)); + print_field("Peripheral to Central MTU: %u", le16_to_cpu(evt->p_mtu)); print_field("ISO Interval: %u", le16_to_cpu(evt->interval)); } @@ -12163,7 +12167,7 @@ static void mgmt_print_long_term_key(const void *data) { uint8_t address_type = get_u8(data + 6); uint8_t key_type = get_u8(data + 7); - uint8_t master = get_u8(data + 8); + uint8_t central = get_u8(data + 8); uint8_t enc_size = get_u8(data + 9); const char *str; @@ -12191,7 +12195,7 @@ static void mgmt_print_long_term_key(const void *data) } print_field("Key type: %s (0x%2.2x)", str, key_type); - print_field("Master: 0x%2.2x", master); + print_field("Central: 0x%2.2x", central); print_field("Encryption size: %u", enc_size); print_hex_field("Diversifier", data + 10, 2); print_hex_field("Randomizer", data + 12, 8);

[Bluez,19/62] monitor: Inclusive language in consts and strings

Commit Message

Patch