Skip to content

Commit 4801cbd

Browse files
carlescuficarlescufi
committed
Bluetooth: controller: Replace {m_,s_} with {c_,p_}
Replace the old master and slave prefixes with the new central and peripehral ones from the Bluetooth spec v5.3. Signed-off-by: Carles Cufi <[email protected]>
1 parent 947b38a commit 4801cbd

File tree

4 files changed

+57
-57
lines changed

4 files changed

+57
-57
lines changed

‎subsys/bluetooth/controller/include/ll.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -152,31 +152,31 @@ uint8_t ll_big_sync_create(uint8_t big_handle, uint16_t sync_handle,
152152
uint8_t ll_big_sync_terminate(uint8_t big_handle, void **rx);
153153

154154
uint8_t ll_cig_parameters_open(uint8_t cig_id,
155-
uint32_t m_interval, uint32_t s_interval,
155+
uint32_t c_interval, uint32_t p_interval,
156156
uint8_t sca, uint8_t packing, uint8_t framing,
157-
uint16_t m_latency, uint16_t s_latency,
157+
uint16_t c_latency, uint16_t p_latency,
158158
uint8_t num_cis);
159159
uint8_t ll_cis_parameters_set(uint8_t cis_id,
160-
uint16_t m_sdu, uint16_t s_sdu,
161-
uint8_t m_phy, uint8_t s_phy,
162-
uint8_t m_rtn, uint8_t s_rtn,
160+
uint16_t c_sdu, uint16_t p_sdu,
161+
uint8_t c_phy, uint8_t p_phy,
162+
uint8_t c_rtn, uint8_t p_rtn,
163163
uint16_t *handle);
164164
uint8_t ll_cig_parameters_commit(uint8_t cig_id);
165165
uint8_t ll_cig_parameters_test_open(uint8_t cig_id,
166-
uint32_t m_interval,
167-
uint32_t s_interval,
168-
uint8_t m_ft,
169-
uint8_t s_ft,
166+
uint32_t c_interval,
167+
uint32_t p_interval,
168+
uint8_t c_ft,
169+
uint8_t p_ft,
170170
uint16_t iso_interval,
171171
uint8_t sca,
172172
uint8_t packing,
173173
uint8_t framing,
174174
uint8_t num_cis);
175175
uint8_t ll_cis_parameters_test_set(uint8_t cis_id,
176-
uint16_t m_sdu, uint16_t s_sdu,
177-
uint16_t m_pdu, uint16_t s_pdu,
178-
uint8_t m_phy, uint8_t s_phy,
179-
uint8_t m_bn, uint8_t s_bn,
176+
uint16_t c_sdu, uint16_t p_sdu,
177+
uint16_t c_pdu, uint16_t p_pdu,
178+
uint8_t c_phy, uint8_t p_phy,
179+
uint8_t c_bn, uint8_t p_bn,
180180
uint16_t *handle);
181181
uint8_t ll_configure_data_path(uint8_t data_path_dir,
182182
uint8_t data_path_id,

‎subsys/bluetooth/controller/ll_sw/pdu.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ struct pdu_data_llctrl_phy_rsp {
614614
} __packed;
615615

616616
struct pdu_data_llctrl_phy_upd_ind {
617-
uint8_t m_to_s_phy;
618-
uint8_t s_to_m_phy;
617+
uint8_t c_to_p_phy;
618+
uint8_t p_to_c_phy;
619619
uint16_t instant;
620620
} __packed;
621621

‎subsys/bluetooth/controller/ll_sw/ull_central_iso.c‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,59 @@
1212
#include "hal/debug.h"
1313

1414
uint8_t ll_cig_parameters_open(uint8_t cig_id,
15-
uint32_t m_interval, uint32_t s_interval,
15+
uint32_t c_interval, uint32_t p_interval,
1616
uint8_t sca, uint8_t packing, uint8_t framing,
17-
uint16_t m_latency, uint16_t s_latency,
17+
uint16_t c_latency, uint16_t p_latency,
1818
uint8_t num_cis)
1919
{
2020
ARG_UNUSED(cig_id);
21-
ARG_UNUSED(m_interval);
22-
ARG_UNUSED(s_interval);
21+
ARG_UNUSED(c_interval);
22+
ARG_UNUSED(p_interval);
2323
ARG_UNUSED(sca);
2424
ARG_UNUSED(packing);
2525
ARG_UNUSED(framing);
26-
ARG_UNUSED(m_latency);
27-
ARG_UNUSED(s_latency);
26+
ARG_UNUSED(c_latency);
27+
ARG_UNUSED(p_latency);
2828
ARG_UNUSED(num_cis);
2929

3030
return BT_HCI_ERR_CMD_DISALLOWED;
3131
}
3232

3333
uint8_t ll_cis_parameters_set(uint8_t cis_id,
34-
uint16_t m_sdu, uint16_t s_sdu,
35-
uint8_t m_phy, uint8_t s_phy,
36-
uint8_t m_rtn, uint8_t s_rtn,
34+
uint16_t c_sdu, uint16_t p_sdu,
35+
uint8_t c_phy, uint8_t p_phy,
36+
uint8_t c_rtn, uint8_t p_rtn,
3737
uint16_t *handle)
3838
{
3939

4040
ARG_UNUSED(cis_id);
41-
ARG_UNUSED(m_sdu);
42-
ARG_UNUSED(s_sdu);
43-
ARG_UNUSED(m_phy);
44-
ARG_UNUSED(s_phy);
45-
ARG_UNUSED(m_rtn);
46-
ARG_UNUSED(s_rtn);
41+
ARG_UNUSED(c_sdu);
42+
ARG_UNUSED(p_sdu);
43+
ARG_UNUSED(c_phy);
44+
ARG_UNUSED(p_phy);
45+
ARG_UNUSED(c_rtn);
46+
ARG_UNUSED(p_rtn);
4747
ARG_UNUSED(handle);
4848

4949
return BT_HCI_ERR_CMD_DISALLOWED;
5050
}
5151

5252
uint8_t ll_cig_parameters_test_open(uint8_t cig_id,
53-
uint32_t m_interval,
54-
uint32_t s_interval,
55-
uint8_t m_ft,
56-
uint8_t s_ft,
53+
uint32_t c_interval,
54+
uint32_t p_interval,
55+
uint8_t c_ft,
56+
uint8_t p_ft,
5757
uint16_t iso_interval,
5858
uint8_t sca,
5959
uint8_t packing,
6060
uint8_t framing,
6161
uint8_t num_cis)
6262
{
6363
ARG_UNUSED(cig_id);
64-
ARG_UNUSED(m_interval);
65-
ARG_UNUSED(s_interval);
66-
ARG_UNUSED(m_ft);
67-
ARG_UNUSED(s_ft);
64+
ARG_UNUSED(c_interval);
65+
ARG_UNUSED(p_interval);
66+
ARG_UNUSED(c_ft);
67+
ARG_UNUSED(p_ft);
6868
ARG_UNUSED(iso_interval);
6969
ARG_UNUSED(sca);
7070
ARG_UNUSED(packing);
@@ -75,21 +75,21 @@ uint8_t ll_cig_parameters_test_open(uint8_t cig_id,
7575
}
7676

7777
uint8_t ll_cis_parameters_test_set(uint8_t cis_id,
78-
uint16_t m_sdu, uint16_t s_sdu,
79-
uint16_t m_pdu, uint16_t s_pdu,
80-
uint8_t m_phy, uint8_t s_phy,
81-
uint8_t m_bn, uint8_t s_bn,
78+
uint16_t c_sdu, uint16_t p_sdu,
79+
uint16_t c_pdu, uint16_t p_pdu,
80+
uint8_t c_phy, uint8_t p_phy,
81+
uint8_t c_bn, uint8_t p_bn,
8282
uint16_t *handle)
8383
{
8484
ARG_UNUSED(cis_id);
85-
ARG_UNUSED(m_sdu);
86-
ARG_UNUSED(s_sdu);
87-
ARG_UNUSED(m_pdu);
88-
ARG_UNUSED(s_pdu);
89-
ARG_UNUSED(m_phy);
90-
ARG_UNUSED(s_phy);
91-
ARG_UNUSED(m_bn);
92-
ARG_UNUSED(s_bn);
85+
ARG_UNUSED(c_sdu);
86+
ARG_UNUSED(p_sdu);
87+
ARG_UNUSED(c_pdu);
88+
ARG_UNUSED(p_pdu);
89+
ARG_UNUSED(c_phy);
90+
ARG_UNUSED(p_phy);
91+
ARG_UNUSED(c_bn);
92+
ARG_UNUSED(p_bn);
9393
ARG_UNUSED(handle);
9494

9595
return BT_HCI_ERR_CMD_DISALLOWED;

‎subsys/bluetooth/controller/ll_sw/ull_conn.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4143,8 +4143,8 @@ static inline void event_phy_upd_ind_prep(struct ll_conn *conn,
41434143
pdu_ctrl_tx->llctrl.opcode =
41444144
PDU_DATA_LLCTRL_TYPE_PHY_UPD_IND;
41454145
ind = &pdu_ctrl_tx->llctrl.phy_upd_ind;
4146-
ind->m_to_s_phy = conn->llcp.phy_upd_ind.tx;
4147-
ind->s_to_m_phy = conn->llcp.phy_upd_ind.rx;
4146+
ind->c_to_p_phy = conn->llcp.phy_upd_ind.tx;
4147+
ind->p_to_c_phy = conn->llcp.phy_upd_ind.rx;
41484148
ind->instant = sys_cpu_to_le16(conn->llcp.phy_upd_ind.instant);
41494149

41504150
ctrl_tx_enqueue(conn, tx);
@@ -5510,7 +5510,7 @@ static inline uint8_t phy_upd_ind_recv(struct ll_conn *conn, memq_link_t *link,
55105510
uint8_t phy;
55115511

55125512
/* Both tx and rx PHY unchanged */
5513-
if (!((ind->m_to_s_phy | ind->s_to_m_phy) & 0x07)) {
5513+
if (!((ind->c_to_p_phy | ind->p_to_c_phy) & 0x07)) {
55145514
struct node_rx_pu *p;
55155515

55165516
/* Not in PHY Update Procedure or PDU in wrong state */
@@ -5550,14 +5550,14 @@ static inline uint8_t phy_upd_ind_recv(struct ll_conn *conn, memq_link_t *link,
55505550
}
55515551

55525552
/* Fail on multiple PHY specified */
5553-
phy = ind->m_to_s_phy;
5553+
phy = ind->c_to_p_phy;
55545554
if (util_ones_count_get(&phy, sizeof(phy)) > 1U) {
55555555
/* Mark for buffer for release */
55565556
(*rx)->hdr.type = NODE_RX_TYPE_RELEASE;
55575557

55585558
return BT_HCI_ERR_INVALID_LL_PARAM;
55595559
}
5560-
phy = ind->s_to_m_phy;
5560+
phy = ind->p_to_c_phy;
55615561
if (util_ones_count_get(&phy, sizeof(phy)) > 1U) {
55625562
/* Mark for buffer for release */
55635563
(*rx)->hdr.type = NODE_RX_TYPE_RELEASE;
@@ -5592,8 +5592,8 @@ static inline uint8_t phy_upd_ind_recv(struct ll_conn *conn, memq_link_t *link,
55925592
conn->llcp.phy_upd_ind.cmd = conn->llcp_phy.cmd;
55935593
}
55945594

5595-
conn->llcp.phy_upd_ind.tx = ind->s_to_m_phy;
5596-
conn->llcp.phy_upd_ind.rx = ind->m_to_s_phy;
5595+
conn->llcp.phy_upd_ind.tx = ind->p_to_c_phy;
5596+
conn->llcp.phy_upd_ind.rx = ind->c_to_p_phy;
55975597
conn->llcp.phy_upd_ind.instant = instant;
55985598
conn->llcp.phy_upd_ind.initiate = 0U;
55995599

0 commit comments

Comments
 (0)