Skip to content

Commit 1325edf

Browse files
carlescuficarlescufi
committed
Bluetooth: hci: Align terms with the Bluetooth v5.3 spec
The new inclusive naming terminology changes in v5.3 of the Bluetooth specification affect the HCI layer, so apply all relevant changes to align with it. Signed-off-by: Carles Cufi <[email protected]>
1 parent 9454b87 commit 1325edf

File tree

14 files changed

+242
-211
lines changed

14 files changed

+242
-211
lines changed

‎doc/releases/release-notes-2.7.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,35 @@ Deprecated in this release
5050
:c:func:`bt_le_filter_accept_list_remove`
5151
:c:func:`bt_le_filter_accept_list_clear`
5252

53+
Modified in this release
54+
55+
* The following Bluetooth macros and structures in :file:`hci.h` have been
56+
modified to align with the inclusive naming in the v5.3 specification:
57+
58+
* ``BT_LE_FEAT_BIT_SLAVE_FEAT_REQ`` is now ``BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG``
59+
* ``BT_LE_FEAT_BIT_CIS_MASTER`` is now ``BT_LE_FEAT_BIT_CIS_CENTRAL``
60+
* ``BT_LE_FEAT_BIT_CIS_SLAVE`` is now ``BT_LE_FEAT_BIT_CIS_PERIPHERAL``
61+
* ``BT_FEAT_LE_SLAVE_FEATURE_XCHG`` is now ``BT_FEAT_LE_PER_INIT_FEAT_XCHG``
62+
* ``BT_FEAT_LE_CIS_MASTER`` is now ``BT_FEAT_LE_CIS_CENTRAL``
63+
* ``BT_FEAT_LE_CIS_SLAVE`` is now ``BT_FEAT_LE_CIS_PERIPHERAL``
64+
* ``BT_LE_STATES_SLAVE_CONN_ADV`` is now ``BT_LE_STATES_PER_CONN_ADV``
65+
* ``BT_HCI_OP_LE_READ_WL_SIZE`` is now ``BT_HCI_OP_LE_READ_FAL_SIZE``
66+
* ``bt_hci_rp_le_read_wl_size`` is now ``bt_hci_rp_le_read_fal_size``
67+
* ``bt_hci_rp_le_read_wl_size::wl_size`` is now ``bt_hci_rp_le_read_fal_size::fal_size``
68+
* ``BT_HCI_OP_LE_CLEAR_WL`` is now ``BT_HCI_OP_LE_CLEAR_FAL``
69+
* ``BT_HCI_OP_LE_ADD_DEV_TO_WL`` is now ``BT_HCI_OP_LE_REM_DEV_FROM_FAL``
70+
* ``bt_hci_cp_le_add_dev_to_wl`` is now ``bt_hci_cp_le_add_dev_to_fal``
71+
* ``BT_HCI_OP_LE_REM_DEV_FROM_WL`` is now ``BT_HCI_OP_LE_REM_DEV_FROM_FAL``
72+
* ``bt_hci_cp_le_rem_dev_from_wl`` is now ``bt_hci_cp_le_rem_dev_from_fal``
73+
* ``BT_HCI_ROLE_MASTER`` is now ``BT_HCI_ROLE_CENTRAL``
74+
* ``BT_HCI_ROLE_SLAVE`` is now ``BT_HCI_ROLE_PERIPHERAL``
75+
* ``BT_EVT_MASK_CL_SLAVE_BC_RX`` is now ``BT_EVT_MASK_CL_PER_BC_RX``
76+
* ``BT_EVT_MASK_CL_SLAVE_BC_TIMEOUT`` is now ``BT_EVT_MASK_CL_PER_BC_TIMEOUT``
77+
* ``BT_EVT_MASK_SLAVE_PAGE_RSP_TIMEOUT`` is now ``BT_EVT_MASK_PER_PAGE_RSP_TIMEOUT``
78+
* ``BT_EVT_MASK_CL_SLAVE_BC_CH_MAP_CHANGE`` is now ``BT_EVT_MASK_CL_PER_BC_CH_MAP_CHANGE``
79+
* ``m_*`` structure members are now ``c_*``
80+
* ``s_*`` structure members are now ``p_*``
81+
5382
Changes in this release
5483
==========================
5584

‎include/bluetooth/hci.h

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ struct bt_hci_cmd_hdr {
132132
#define BT_LE_FEAT_BIT_ENC 0
133133
#define BT_LE_FEAT_BIT_CONN_PARAM_REQ 1
134134
#define BT_LE_FEAT_BIT_EXT_REJ_IND 2
135-
#define BT_LE_FEAT_BIT_SLAVE_FEAT_REQ 3
135+
#define BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG 3
136136
#define BT_LE_FEAT_BIT_PING 4
137137
#define BT_LE_FEAT_BIT_DLE 5
138138
#define BT_LE_FEAT_BIT_PRIVACY 6
@@ -157,8 +157,8 @@ struct bt_hci_cmd_hdr {
157157
#define BT_LE_FEAT_BIT_PAST_RECV 25
158158
#define BT_LE_FEAT_BIT_SCA_UPDATE 26
159159
#define BT_LE_FEAT_BIT_REMOTE_PUB_KEY_VALIDATE 27
160-
#define BT_LE_FEAT_BIT_CIS_MASTER 28
161-
#define BT_LE_FEAT_BIT_CIS_SLAVE 29
160+
#define BT_LE_FEAT_BIT_CIS_CENTRAL 28
161+
#define BT_LE_FEAT_BIT_CIS_PERIPHERAL 29
162162
#define BT_LE_FEAT_BIT_ISO_BROADCASTER 30
163163
#define BT_LE_FEAT_BIT_SYNC_RECEIVER 31
164164
#define BT_LE_FEAT_BIT_ISO_CHANNELS 32
@@ -173,8 +173,8 @@ struct bt_hci_cmd_hdr {
173173
BT_LE_FEAT_BIT_ENC)
174174
#define BT_FEAT_LE_CONN_PARAM_REQ_PROC(feat) BT_LE_FEAT_TEST(feat, \
175175
BT_LE_FEAT_BIT_CONN_PARAM_REQ)
176-
#define BT_FEAT_LE_SLAVE_FEATURE_XCHG(feat) BT_LE_FEAT_TEST(feat, \
177-
BT_LE_FEAT_BIT_SLAVE_FEAT_REQ)
176+
#define BT_FEAT_LE_PER_INIT_FEAT_XCHG(feat) BT_LE_FEAT_TEST(feat, \
177+
BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG)
178178
#define BT_FEAT_LE_DLE(feat) BT_LE_FEAT_TEST(feat, \
179179
BT_LE_FEAT_BIT_DLE)
180180
#define BT_FEAT_LE_PHY_2M(feat) BT_LE_FEAT_TEST(feat, \
@@ -205,26 +205,26 @@ struct bt_hci_cmd_hdr {
205205
BT_LE_FEAT_BIT_PAST_SEND)
206206
#define BT_FEAT_LE_PAST_RECV(feat) BT_LE_FEAT_TEST(feat, \
207207
BT_LE_FEAT_BIT_PAST_RECV)
208-
#define BT_FEAT_LE_CIS_MASTER(feat) BT_LE_FEAT_TEST(feat, \
209-
BT_LE_FEAT_BIT_CIS_MASTER)
210-
#define BT_FEAT_LE_CIS_SLAVE(feat) BT_LE_FEAT_TEST(feat, \
211-
BT_LE_FEAT_BIT_CIS_SLAVE)
208+
#define BT_FEAT_LE_CIS_CENTRAL(feat) BT_LE_FEAT_TEST(feat, \
209+
BT_LE_FEAT_BIT_CIS_CENTRAL)
210+
#define BT_FEAT_LE_CIS_PERIPHERAL(feat) BT_LE_FEAT_TEST(feat, \
211+
BT_LE_FEAT_BIT_CIS_PERIPHERAL)
212212
#define BT_FEAT_LE_ISO_BROADCASTER(feat) BT_LE_FEAT_TEST(feat, \
213213
BT_LE_FEAT_BIT_ISO_BROADCASTER)
214214
#define BT_FEAT_LE_SYNC_RECEIVER(feat) BT_LE_FEAT_TEST(feat, \
215215
BT_LE_FEAT_BIT_SYNC_RECEIVER)
216216
#define BT_FEAT_LE_ISO_CHANNELS(feat) BT_LE_FEAT_TEST(feat, \
217217
BT_LE_FEAT_BIT_ISO_CHANNELS)
218218

219-
#define BT_FEAT_LE_CIS(feat) (BT_FEAT_LE_CIS_MASTER(feat) | \
220-
BT_FEAT_LE_CIS_SLAVE(feat))
219+
#define BT_FEAT_LE_CIS(feat) (BT_FEAT_LE_CIS_CENTRAL(feat) | \
220+
BT_FEAT_LE_CIS_PERIPHERAL(feat))
221221
#define BT_FEAT_LE_BIS(feat) (BT_FEAT_LE_ISO_BROADCASTER(feat) | \
222222
BT_FEAT_LE_SYNC_RECEIVER(feat))
223223
#define BT_FEAT_LE_ISO(feat) (BT_FEAT_LE_CIS(feat) | \
224224
BT_FEAT_LE_BIS(feat))
225225

226226
/* LE States */
227-
#define BT_LE_STATES_SLAVE_CONN_ADV(states) (states & 0x0000004000000000)
227+
#define BT_LE_STATES_PER_CONN_ADV(states) (states & 0x0000004000000000)
228228

229229
/* Bonding/authentication types */
230230
#define BT_HCI_NO_BONDING 0x00
@@ -843,10 +843,10 @@ struct bt_hci_cp_le_set_random_address {
843843
#define BT_LE_ADV_CHAN_MAP_CHAN_39 0x04
844844
#define BT_LE_ADV_CHAN_MAP_ALL 0x07
845845

846-
#define BT_LE_ADV_FP_NO_WHITELIST 0x00
847-
#define BT_LE_ADV_FP_WHITELIST_SCAN_REQ 0x01
848-
#define BT_LE_ADV_FP_WHITELIST_CONN_IND 0x02
849-
#define BT_LE_ADV_FP_WHITELIST_BOTH 0x03
846+
#define BT_LE_ADV_FP_NO_FILTER 0x00
847+
#define BT_LE_ADV_FP_FILTER_SCAN_REQ 0x01
848+
#define BT_LE_ADV_FP_FILTER_CONN_IND 0x02
849+
#define BT_LE_ADV_FP_FILTER_BOTH 0x03
850850

851851
#define BT_HCI_OP_LE_SET_ADV_PARAM BT_OP(BT_OGF_LE, 0x0006)
852852
struct bt_hci_cp_le_set_adv_param {
@@ -890,8 +890,10 @@ struct bt_hci_cp_le_set_adv_enable {
890890
#define BT_HCI_LE_SCAN_PASSIVE 0x00
891891
#define BT_HCI_LE_SCAN_ACTIVE 0x01
892892

893-
#define BT_HCI_LE_SCAN_FP_NO_WHITELIST 0x00
894-
#define BT_HCI_LE_SCAN_FP_USE_WHITELIST 0x01
893+
#define BT_HCI_LE_SCAN_FP_BASIC_NO_FILTER 0x00
894+
#define BT_HCI_LE_SCAN_FP_BASIC_FILTER 0x01
895+
#define BT_HCI_LE_SCAN_FP_EXT_NO_FILTER 0x02
896+
#define BT_HCI_LE_SCAN_FP_EXT_FILTER 0x03
895897

896898
struct bt_hci_cp_le_set_scan_param {
897899
uint8_t scan_type;
@@ -916,8 +918,8 @@ struct bt_hci_cp_le_set_scan_enable {
916918

917919
#define BT_HCI_OP_LE_CREATE_CONN BT_OP(BT_OGF_LE, 0x000d)
918920

919-
#define BT_HCI_LE_CREATE_CONN_FP_DIRECT 0x00
920-
#define BT_HCI_LE_CREATE_CONN_FP_WHITELIST 0x01
921+
#define BT_HCI_LE_CREATE_CONN_FP_NO_FILTER 0x00
922+
#define BT_HCI_LE_CREATE_CONN_FP_FILTER 0x01
921923

922924
struct bt_hci_cp_le_create_conn {
923925
uint16_t scan_interval;
@@ -935,21 +937,21 @@ struct bt_hci_cp_le_create_conn {
935937

936938
#define BT_HCI_OP_LE_CREATE_CONN_CANCEL BT_OP(BT_OGF_LE, 0x000e)
937939

938-
#define BT_HCI_OP_LE_READ_WL_SIZE BT_OP(BT_OGF_LE, 0x000f)
939-
struct bt_hci_rp_le_read_wl_size {
940+
#define BT_HCI_OP_LE_READ_FAL_SIZE BT_OP(BT_OGF_LE, 0x000f)
941+
struct bt_hci_rp_le_read_fal_size {
940942
uint8_t status;
941-
uint8_t wl_size;
943+
uint8_t fal_size;
942944
} __packed;
943945

944-
#define BT_HCI_OP_LE_CLEAR_WL BT_OP(BT_OGF_LE, 0x0010)
946+
#define BT_HCI_OP_LE_CLEAR_FAL BT_OP(BT_OGF_LE, 0x0010)
945947

946-
#define BT_HCI_OP_LE_ADD_DEV_TO_WL BT_OP(BT_OGF_LE, 0x0011)
947-
struct bt_hci_cp_le_add_dev_to_wl {
948+
#define BT_HCI_OP_LE_ADD_DEV_TO_FAL BT_OP(BT_OGF_LE, 0x0011)
949+
struct bt_hci_cp_le_add_dev_to_fal {
948950
bt_addr_le_t addr;
949951
} __packed;
950952

951-
#define BT_HCI_OP_LE_REM_DEV_FROM_WL BT_OP(BT_OGF_LE, 0x0012)
952-
struct bt_hci_cp_le_rem_dev_from_wl {
953+
#define BT_HCI_OP_LE_REM_DEV_FROM_FAL BT_OP(BT_OGF_LE, 0x0012)
954+
struct bt_hci_cp_le_rem_dev_from_fal {
953955
bt_addr_le_t addr;
954956
} __packed;
955957

@@ -1729,23 +1731,23 @@ struct bt_hci_rp_le_read_iso_tx_sync {
17291731
#define BT_HCI_OP_LE_SET_CIG_PARAMS BT_OP(BT_OGF_LE, 0x0062)
17301732
struct bt_hci_cis_params {
17311733
uint8_t cis_id;
1732-
uint16_t m_sdu;
1733-
uint16_t s_sdu;
1734-
uint8_t m_phy;
1735-
uint8_t s_phy;
1736-
uint8_t m_rtn;
1737-
uint8_t s_rtn;
1734+
uint16_t c_sdu;
1735+
uint16_t p_sdu;
1736+
uint8_t c_phy;
1737+
uint8_t p_phy;
1738+
uint8_t c_rtn;
1739+
uint8_t p_rtn;
17381740
} __packed;
17391741

17401742
struct bt_hci_cp_le_set_cig_params {
17411743
uint8_t cig_id;
1742-
uint8_t m_interval[3];
1743-
uint8_t s_interval[3];
1744+
uint8_t c_interval[3];
1745+
uint8_t p_interval[3];
17441746
uint8_t sca;
17451747
uint8_t packing;
17461748
uint8_t framing;
1747-
uint16_t m_latency;
1748-
uint16_t s_latency;
1749+
uint16_t c_latency;
1750+
uint16_t p_latency;
17491751
uint8_t num_cis;
17501752
struct bt_hci_cis_params cis[0];
17511753
} __packed;
@@ -1761,22 +1763,22 @@ struct bt_hci_rp_le_set_cig_params {
17611763
struct bt_hci_cis_params_test {
17621764
uint8_t cis_id;
17631765
uint8_t nse;
1764-
uint16_t m_sdu;
1765-
uint16_t s_sdu;
1766-
uint16_t m_pdu;
1767-
uint16_t s_pdu;
1768-
uint8_t m_phy;
1769-
uint8_t s_phy;
1770-
uint8_t m_bn;
1771-
uint8_t s_bn;
1766+
uint16_t c_sdu;
1767+
uint16_t p_sdu;
1768+
uint16_t c_pdu;
1769+
uint16_t p_pdu;
1770+
uint8_t c_phy;
1771+
uint8_t p_phy;
1772+
uint8_t c_bn;
1773+
uint8_t p_bn;
17721774
} __packed;
17731775

17741776
struct bt_hci_cp_le_set_cig_params_test {
17751777
uint8_t cig_id;
1776-
uint8_t m_interval[3];
1777-
uint8_t s_interval[3];
1778-
uint8_t m_ft;
1779-
uint8_t s_ft;
1778+
uint8_t c_interval[3];
1779+
uint8_t p_interval[3];
1780+
uint8_t c_ft;
1781+
uint8_t p_ft;
17801782
uint16_t iso_interval;
17811783
uint8_t sca;
17821784
uint8_t packing;
@@ -2237,8 +2239,8 @@ struct bt_hci_evt_auth_payload_timeout_exp {
22372239
uint16_t handle;
22382240
} __packed;
22392241

2240-
#define BT_HCI_ROLE_MASTER 0x00
2241-
#define BT_HCI_ROLE_SLAVE 0x01
2242+
#define BT_HCI_ROLE_CENTRAL 0x00
2243+
#define BT_HCI_ROLE_PERIPHERAL 0x01
22422244

22432245
#define BT_HCI_EVT_LE_CONN_COMPLETE 0x01
22442246
struct bt_hci_evt_le_conn_complete {
@@ -2505,17 +2507,17 @@ struct bt_hci_evt_le_cis_established {
25052507
uint16_t conn_handle;
25062508
uint8_t cig_sync_delay[3];
25072509
uint8_t cis_sync_delay[3];
2508-
uint8_t m_latency[3];
2509-
uint8_t s_latency[3];
2510-
uint8_t m_phy;
2511-
uint8_t s_phy;
2510+
uint8_t c_latency[3];
2511+
uint8_t p_latency[3];
2512+
uint8_t c_phy;
2513+
uint8_t p_phy;
25122514
uint8_t nse;
2513-
uint8_t m_bn;
2514-
uint8_t s_bn;
2515-
uint8_t m_ft;
2516-
uint8_t s_ft;
2517-
uint16_t m_max_pdu;
2518-
uint16_t s_max_pdu;
2515+
uint8_t c_bn;
2516+
uint8_t p_bn;
2517+
uint8_t c_ft;
2518+
uint8_t p_ft;
2519+
uint16_t c_max_pdu;
2520+
uint16_t p_max_pdu;
25192521
uint16_t interval;
25202522
} __packed;
25212523

@@ -2632,11 +2634,11 @@ struct bt_hci_evt_le_biginfo_adv_report {
26322634
#define BT_EVT_MASK_TRIGG_CLOCK_CAPTURE BT_EVT_BIT(14)
26332635
#define BT_EVT_MASK_SYNCH_TRAIN_COMPLETE BT_EVT_BIT(15)
26342636
#define BT_EVT_MASK_SYNCH_TRAIN_RX BT_EVT_BIT(16)
2635-
#define BT_EVT_MASK_CL_SLAVE_BC_RX BT_EVT_BIT(17)
2636-
#define BT_EVT_MASK_CL_SLAVE_BC_TIMEOUT BT_EVT_BIT(18)
2637+
#define BT_EVT_MASK_CL_PER_BC_RX BT_EVT_BIT(17)
2638+
#define BT_EVT_MASK_CL_PER_BC_TIMEOUT BT_EVT_BIT(18)
26372639
#define BT_EVT_MASK_TRUNC_PAGE_COMPLETE BT_EVT_BIT(19)
2638-
#define BT_EVT_MASK_SLAVE_PAGE_RSP_TIMEOUT BT_EVT_BIT(20)
2639-
#define BT_EVT_MASK_CL_SLAVE_BC_CH_MAP_CHANGE BT_EVT_BIT(21)
2640+
#define BT_EVT_MASK_PER_PAGE_RSP_TIMEOUT BT_EVT_BIT(20)
2641+
#define BT_EVT_MASK_CL_PER_BC_CH_MAP_CHANGE BT_EVT_BIT(21)
26402642
#define BT_EVT_MASK_INQUIRY_RSP_NOT BT_EVT_BIT(22)
26412643
#define BT_EVT_MASK_AUTH_PAYLOAD_TIMEOUT_EXP BT_EVT_BIT(23)
26422644
#define BT_EVT_MASK_SAM_STATUS_CHANGE BT_EVT_BIT(24)

0 commit comments

Comments
 (0)