Commit 4801cbd9 authored by Carles Cufi's avatar Carles Cufi
Browse files

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: default avatarCarles Cufi <carles.cufi@nordicsemi.no>
parent 947b38ac

subsys/bluetooth/controller/include/ll.h

+13 −13
Original line number Diff line number Diff line
@@ -152,31 +152,31 @@ uint8_t ll_big_sync_create(uint8_t big_handle, uint16_t sync_handle, 
uint8_t ll_big_sync_terminate(uint8_t big_handle, void **rx);



uint8_t ll_cig_parameters_open(uint8_t cig_id,

			       uint32_t m_interval, uint32_t s_interval,

			       uint32_t c_interval, uint32_t p_interval,

			       uint8_t sca, uint8_t packing, uint8_t framing,

			       uint16_t m_latency, uint16_t s_latency,

			       uint16_t c_latency, uint16_t p_latency,

			       uint8_t num_cis);

uint8_t ll_cis_parameters_set(uint8_t cis_id,

			      uint16_t m_sdu, uint16_t s_sdu,

			      uint8_t m_phy, uint8_t s_phy,

			      uint8_t m_rtn, uint8_t s_rtn,

			      uint16_t c_sdu, uint16_t p_sdu,

			      uint8_t c_phy, uint8_t p_phy,

			      uint8_t c_rtn, uint8_t p_rtn,

			      uint16_t *handle);

uint8_t ll_cig_parameters_commit(uint8_t cig_id);

uint8_t ll_cig_parameters_test_open(uint8_t cig_id,

				    uint32_t m_interval,

				    uint32_t s_interval,

				    uint8_t m_ft,

				    uint8_t s_ft,

				    uint32_t c_interval,

				    uint32_t p_interval,

				    uint8_t c_ft,

				    uint8_t p_ft,

				    uint16_t iso_interval,

				    uint8_t sca,

				    uint8_t packing,

				    uint8_t framing,

				    uint8_t num_cis);

uint8_t ll_cis_parameters_test_set(uint8_t cis_id,

				   uint16_t m_sdu, uint16_t s_sdu,

				   uint16_t m_pdu, uint16_t s_pdu,

				   uint8_t m_phy, uint8_t s_phy,

				   uint8_t m_bn, uint8_t s_bn,

				   uint16_t c_sdu, uint16_t p_sdu,

				   uint16_t c_pdu, uint16_t p_pdu,

				   uint8_t c_phy, uint8_t p_phy,

				   uint8_t c_bn, uint8_t p_bn,

				   uint16_t *handle);

uint8_t ll_configure_data_path(uint8_t data_path_dir,

			       uint8_t data_path_id,

subsys/bluetooth/controller/ll_sw/pdu.h

+2 −2
Original line number Diff line number Diff line
@@ -614,8 +614,8 @@ struct pdu_data_llctrl_phy_rsp { 
} __packed;



struct pdu_data_llctrl_phy_upd_ind {

	uint8_t  m_to_s_phy;

	uint8_t  s_to_m_phy;

	uint8_t  c_to_p_phy;

	uint8_t  p_to_c_phy;

	uint16_t instant;

} __packed;

subsys/bluetooth/controller/ll_sw/ull_central_iso.c

+35 −35
Original line number Diff line number Diff line
@@ -12,48 +12,48 @@ 
#include "hal/debug.h"



uint8_t ll_cig_parameters_open(uint8_t cig_id,

			       uint32_t m_interval, uint32_t s_interval,

			       uint32_t c_interval, uint32_t p_interval,

			       uint8_t sca, uint8_t packing, uint8_t framing,

			       uint16_t m_latency, uint16_t s_latency,

			       uint16_t c_latency, uint16_t p_latency,

			       uint8_t num_cis)

{

	ARG_UNUSED(cig_id);

	ARG_UNUSED(m_interval);

	ARG_UNUSED(s_interval);

	ARG_UNUSED(c_interval);

	ARG_UNUSED(p_interval);

	ARG_UNUSED(sca);

	ARG_UNUSED(packing);

	ARG_UNUSED(framing);

	ARG_UNUSED(m_latency);

	ARG_UNUSED(s_latency);

	ARG_UNUSED(c_latency);

	ARG_UNUSED(p_latency);

	ARG_UNUSED(num_cis);



	return BT_HCI_ERR_CMD_DISALLOWED;

}



uint8_t ll_cis_parameters_set(uint8_t cis_id,

			      uint16_t m_sdu, uint16_t s_sdu,

			      uint8_t m_phy, uint8_t s_phy,

			      uint8_t m_rtn, uint8_t s_rtn,

			      uint16_t c_sdu, uint16_t p_sdu,

			      uint8_t c_phy, uint8_t p_phy,

			      uint8_t c_rtn, uint8_t p_rtn,

			      uint16_t *handle)

{



	ARG_UNUSED(cis_id);

	ARG_UNUSED(m_sdu);

	ARG_UNUSED(s_sdu);

	ARG_UNUSED(m_phy);

	ARG_UNUSED(s_phy);

	ARG_UNUSED(m_rtn);

	ARG_UNUSED(s_rtn);

	ARG_UNUSED(c_sdu);

	ARG_UNUSED(p_sdu);

	ARG_UNUSED(c_phy);

	ARG_UNUSED(p_phy);

	ARG_UNUSED(c_rtn);

	ARG_UNUSED(p_rtn);

	ARG_UNUSED(handle);



	return BT_HCI_ERR_CMD_DISALLOWED;

}



uint8_t ll_cig_parameters_test_open(uint8_t cig_id,

				    uint32_t m_interval,

				    uint32_t s_interval,

				    uint8_t  m_ft,

				    uint8_t  s_ft,

				    uint32_t c_interval,

				    uint32_t p_interval,

				    uint8_t  c_ft,

				    uint8_t  p_ft,

				    uint16_t iso_interval,

				    uint8_t  sca,

				    uint8_t  packing,
@@ -61,10 +61,10 @@ uint8_t ll_cig_parameters_test_open(uint8_t cig_id, 
				    uint8_t  num_cis)

{

	ARG_UNUSED(cig_id);

	ARG_UNUSED(m_interval);

	ARG_UNUSED(s_interval);

	ARG_UNUSED(m_ft);

	ARG_UNUSED(s_ft);

	ARG_UNUSED(c_interval);

	ARG_UNUSED(p_interval);

	ARG_UNUSED(c_ft);

	ARG_UNUSED(p_ft);

	ARG_UNUSED(iso_interval);

	ARG_UNUSED(sca);

	ARG_UNUSED(packing);
@@ -75,21 +75,21 @@ uint8_t ll_cig_parameters_test_open(uint8_t cig_id, 
}



uint8_t ll_cis_parameters_test_set(uint8_t  cis_id,

				   uint16_t m_sdu, uint16_t s_sdu,

				   uint16_t m_pdu, uint16_t s_pdu,

				   uint8_t m_phy, uint8_t s_phy,

				   uint8_t m_bn, uint8_t s_bn,

				   uint16_t c_sdu, uint16_t p_sdu,

				   uint16_t c_pdu, uint16_t p_pdu,

				   uint8_t c_phy, uint8_t p_phy,

				   uint8_t c_bn, uint8_t p_bn,

				   uint16_t *handle)

{

	ARG_UNUSED(cis_id);

	ARG_UNUSED(m_sdu);

	ARG_UNUSED(s_sdu);

	ARG_UNUSED(m_pdu);

	ARG_UNUSED(s_pdu);

	ARG_UNUSED(m_phy);

	ARG_UNUSED(s_phy);

	ARG_UNUSED(m_bn);

	ARG_UNUSED(s_bn);

	ARG_UNUSED(c_sdu);

	ARG_UNUSED(p_sdu);

	ARG_UNUSED(c_pdu);

	ARG_UNUSED(p_pdu);

	ARG_UNUSED(c_phy);

	ARG_UNUSED(p_phy);

	ARG_UNUSED(c_bn);

	ARG_UNUSED(p_bn);

	ARG_UNUSED(handle);



	return BT_HCI_ERR_CMD_DISALLOWED;

subsys/bluetooth/controller/ll_sw/ull_conn.c

+7 −7
Original line number Diff line number Diff line
@@ -4143,8 +4143,8 @@ static inline void event_phy_upd_ind_prep(struct ll_conn *conn, 
		pdu_ctrl_tx->llctrl.opcode =

			PDU_DATA_LLCTRL_TYPE_PHY_UPD_IND;

		ind = &pdu_ctrl_tx->llctrl.phy_upd_ind;

		ind->m_to_s_phy = conn->llcp.phy_upd_ind.tx;

		ind->s_to_m_phy = conn->llcp.phy_upd_ind.rx;

		ind->c_to_p_phy = conn->llcp.phy_upd_ind.tx;

		ind->p_to_c_phy = conn->llcp.phy_upd_ind.rx;

		ind->instant = sys_cpu_to_le16(conn->llcp.phy_upd_ind.instant);



		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, 
	uint8_t phy;



	/* Both tx and rx PHY unchanged */

	if (!((ind->m_to_s_phy | ind->s_to_m_phy) & 0x07)) {

	if (!((ind->c_to_p_phy | ind->p_to_c_phy) & 0x07)) {

		struct node_rx_pu *p;



		/* 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, 
	}



	/* Fail on multiple PHY specified */

	phy = ind->m_to_s_phy;

	phy = ind->c_to_p_phy;

	if (util_ones_count_get(&phy, sizeof(phy)) > 1U) {

		/* Mark for buffer for release */

		(*rx)->hdr.type = NODE_RX_TYPE_RELEASE;



		return BT_HCI_ERR_INVALID_LL_PARAM;

	}

	phy = ind->s_to_m_phy;

	phy = ind->p_to_c_phy;

	if (util_ones_count_get(&phy, sizeof(phy)) > 1U) {

		/* Mark for buffer for release */

		(*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, 
		conn->llcp.phy_upd_ind.cmd = conn->llcp_phy.cmd;

	}



	conn->llcp.phy_upd_ind.tx = ind->s_to_m_phy;

	conn->llcp.phy_upd_ind.rx = ind->m_to_s_phy;

	conn->llcp.phy_upd_ind.tx = ind->p_to_c_phy;

	conn->llcp.phy_upd_ind.rx = ind->c_to_p_phy;

	conn->llcp.phy_upd_ind.instant = instant;

	conn->llcp.phy_upd_ind.initiate = 0U;

CRA Git | Maintained and supported by SUSTech CRA and CCSE