leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: use inclusive language to describe CPB

Browse Source 
This patch replaces some non-inclusive terms based on the appropriate
language mapping table compiled by the Bluetooth SIG:
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf

Specifically, these terms are replaced when describing the
connectionless peripheral broadcast feature:
master -> central
slave  -> peripheral

Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Archie Pusaka 2021-05-31 16:37:22 +08:00 committed by Marcel Holtmann
parent 76c185a515
commit 6397729bb7
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/net/bluetooth/hci.h
View File

@ -36,7 +36,7 @@
#define HCI_MAX_AMP_ASSOC_SIZE 672 #define HCI_MAX_AMP_ASSOC_SIZE 672
#define HCI_MAX_CSB_DATA_SIZE 252 #define HCI_MAX_CPB_DATA_SIZE 252
/* HCI dev events */ /* HCI dev events */
#define HCI_DEV_REG 1 #define HCI_DEV_REG 1
@ -472,10 +472,10 @@ enum {
#define LMP_EXTFEATURES 0x80 #define LMP_EXTFEATURES 0x80
/* Extended LMP features */ /* Extended LMP features */
#define LMP_CSB_MASTER 0x01 #define LMP_CPB_CENTRAL 0x01
#define LMP_CSB_SLAVE 0x02 #define LMP_CPB_PERIPHERAL 0x02
#define LMP_SYNC_TRAIN 0x04 #define LMP_SYNC_TRAIN 0x04
#define LMP_SYNC_SCAN 0x08 #define LMP_SYNC_SCAN 0x08
#define LMP_SC 0x01 #define LMP_SC 0x01
#define LMP_PING 0x02 #define LMP_PING 0x02
@ -877,17 +877,17 @@ struct hci_rp_logical_link_cancel {
__u8 flow_spec_id; __u8 flow_spec_id;
} __packed; } __packed;
#define HCI_OP_SET_CSB 0x0441 #define HCI_OP_SET_CPB 0x0441
struct hci_cp_set_csb { struct hci_cp_set_cpb {
__u8 enable; __u8 enable;
__u8 lt_addr; __u8 lt_addr;
__u8 lpo_allowed; __u8 lpo_allowed;
__le16 packet_type; __le16 packet_type;
__le16 interval_min; __le16 interval_min;
__le16 interval_max; __le16 interval_max;
__le16 csb_sv_tout; __le16 cpb_sv_tout;
} __packed; } __packed;
struct hci_rp_set_csb { struct hci_rp_set_cpb {
__u8 status; __u8 status;
__u8 lt_addr; __u8 lt_addr;
__le16 interval; __le16 interval;
@ -1184,14 +1184,14 @@ struct hci_rp_delete_reserved_lt_addr {
__u8 lt_addr; __u8 lt_addr;
} __packed; } __packed;
#define HCI_OP_SET_CSB_DATA 0x0c76 #define HCI_OP_SET_CPB_DATA 0x0c76
struct hci_cp_set_csb_data { struct hci_cp_set_cpb_data {
__u8 lt_addr; __u8 lt_addr;
__u8 fragment; __u8 fragment;
__u8 data_length; __u8 data_length;
__u8 data[HCI_MAX_CSB_DATA_SIZE]; __u8 data[HCI_MAX_CPB_DATA_SIZE];
} __packed; } __packed;
struct hci_rp_set_csb_data { struct hci_rp_set_cpb_data {
__u8 status; __u8 status;
__u8 lt_addr; __u8 lt_addr;
} __packed; } __packed;

4
include/net/bluetooth/hci_core.h
View File

@ -1394,8 +1394,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
#define lmp_edr_5slot_capable(dev) ((dev)->features[0][5] & LMP_EDR_5SLOT) #define lmp_edr_5slot_capable(dev) ((dev)->features[0][5] & LMP_EDR_5SLOT)
/* ----- Extended LMP capabilities ----- */ /* ----- Extended LMP capabilities ----- */
#define lmp_csb_master_capable(dev) ((dev)->features[2][0] & LMP_CSB_MASTER) #define lmp_cpb_central_capable(dev) ((dev)->features[2][0] & LMP_CPB_CENTRAL)
#define lmp_csb_slave_capable(dev) ((dev)->features[2][0] & LMP_CSB_SLAVE) #define lmp_cpb_peripheral_capable(dev) ((dev)->features[2][0] & LMP_CPB_PERIPHERAL)
#define lmp_sync_train_capable(dev) ((dev)->features[2][0] & LMP_SYNC_TRAIN) #define lmp_sync_train_capable(dev) ((dev)->features[2][0] & LMP_SYNC_TRAIN)
#define lmp_sync_scan_capable(dev) ((dev)->features[2][0] & LMP_SYNC_SCAN) #define lmp_sync_scan_capable(dev) ((dev)->features[2][0] & LMP_SYNC_SCAN)
#define lmp_sc_capable(dev) ((dev)->features[2][1] & LMP_SC) #define lmp_sc_capable(dev) ((dev)->features[2][1] & LMP_SC)

2
net/bluetooth/hci_conn.c
View File

@ -1842,7 +1842,7 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
/* BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 2, Part B page 471: /* BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 2, Part B page 471:
* Table 6.2: Packets defined for synchronous, asynchronous, and * Table 6.2: Packets defined for synchronous, asynchronous, and
* CSB logical transport types. * CPB logical transport types.
*/ */
switch (conn->type) { switch (conn->type) {
case SCO_LINK: case SCO_LINK:

16
net/bluetooth/hci_core.c
View File

@ -545,24 +545,24 @@ static void hci_set_event_mask_page_2(struct hci_request *req)
u8 events[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; u8 events[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
bool changed = false; bool changed = false;
/* If Connectionless Slave Broadcast master role is supported /* If Connectionless Peripheral Broadcast central role is supported
* enable all necessary events for it. * enable all necessary events for it.
*/ */
if (lmp_csb_master_capable(hdev)) { if (lmp_cpb_central_capable(hdev)) {
events[1] |= 0x40; /* Triggered Clock Capture */ events[1] |= 0x40; /* Triggered Clock Capture */
events[1] |= 0x80; /* Synchronization Train Complete */ events[1] |= 0x80; /* Synchronization Train Complete */
events[2] |= 0x10; /* Slave Page Response Timeout */ events[2] |= 0x10; /* Peripheral Page Response Timeout */
events[2] |= 0x20; /* CSB Channel Map Change */ events[2] |= 0x20; /* CPB Channel Map Change */
changed = true; changed = true;
} }
/* If Connectionless Slave Broadcast slave role is supported /* If Connectionless Peripheral Broadcast peripheral role is supported
* enable all necessary events for it. * enable all necessary events for it.
*/ */
if (lmp_csb_slave_capable(hdev)) { if (lmp_cpb_peripheral_capable(hdev)) {
events[2] |= 0x01; /* Synchronization Train Received */ events[2] |= 0x01; /* Synchronization Train Received */
events[2] |= 0x02; /* CSB Receive */ events[2] |= 0x02; /* CPB Receive */
events[2] |= 0x04; /* CSB Timeout */ events[2] |= 0x04; /* CPB Timeout */
events[2] |= 0x08; /* Truncated Page Complete */ events[2] |= 0x08; /* Truncated Page Complete */
changed = true; changed = true;
} }