Commit cce8bf55 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Anas Nashif
Browse files

Bluetooth: controller: Add missing PDU struct definitions 



Add missing PDU struct definitions in pdu.h file.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 302333c0

subsys/bluetooth/controller/ll_sw/ctrl.c

+19 −23
Original line number Diff line number Diff line
@@ -2008,7 +2008,7 @@ isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *radio_pdu_node_rx, 
		      &pdu_data_rx->payload.llctrl.ctrldata.reject_ext_ind;

	if (rej_ext_ind->reject_opcode == PDU_DATA_LLCTRL_TYPE_LENGTH_REQ) {

		struct connection *conn = _radio.conn_curr;

		struct pdu_data_llctrl_length_req_rsp *lr;

		struct pdu_data_llctrl_length_rsp *lr;



		/* Procedure complete */

		conn->llcp_length.ack = conn->llcp_length.req;
@@ -2020,11 +2020,11 @@ isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *radio_pdu_node_rx, 
		/* prepare length rsp structure */

		pdu_data_rx->len = offsetof(struct pdu_data_llctrl,

					    ctrldata) +

			sizeof(struct pdu_data_llctrl_length_req_rsp);

			sizeof(struct pdu_data_llctrl_length_rsp);

		pdu_data_rx->payload.llctrl.opcode =

			PDU_DATA_LLCTRL_TYPE_LENGTH_RSP;



		lr = (void *)&pdu_data_rx->payload.llctrl.ctrldata.length_req;

		lr = (void *)&pdu_data_rx->payload.llctrl.ctrldata.length_rsp;

		lr->max_rx_octets = conn->max_rx_octets;

		lr->max_tx_octets = conn->max_tx_octets;

#if !defined(CONFIG_BT_CTLR_PHY)
@@ -2211,10 +2211,9 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, 
		 PDU_DATA_LLCTRL_TYPE_LENGTH_RSP) ||

		(pdu_data_rx->payload.llctrl.opcode ==

		 PDU_DATA_LLCTRL_TYPE_LENGTH_REQ)))))) {

		struct pdu_data_llctrl_length_req_rsp *lr;

		struct pdu_data_llctrl_length_req *lr;



		lr = (struct pdu_data_llctrl_length_req_rsp *)

			&pdu_data_rx->payload.llctrl.ctrldata.length_req;

		lr = (void *)&pdu_data_rx->payload.llctrl.ctrldata.length_req;



		/* use the minimal of our default_tx_octets and

		 * peer max_rx_octets
@@ -3043,7 +3042,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, 
			} else {

				struct pdu_data_llctrl *c =

					&pdu_data_rx->payload.llctrl;

				struct pdu_data_llctrl_phy_req_rsp *p =

				struct pdu_data_llctrl_phy_req *p =

					&c->ctrldata.phy_req;



				_radio.conn_curr->llcp_phy.state =
@@ -3075,7 +3074,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, 
		     _radio.conn_curr->llcp_phy.req) &&

		    (_radio.conn_curr->llcp_phy.state ==

		     LLCP_PHY_STATE_RSP_WAIT)) {

			struct pdu_data_llctrl_phy_req_rsp *p =

			struct pdu_data_llctrl_phy_rsp *p =

				&pdu_data_rx->payload.llctrl.ctrldata.phy_rsp;



			_radio.conn_curr->llcp_phy.state = LLCP_PHY_STATE_UPD;
@@ -7335,7 +7334,7 @@ static inline void event_len_prep(struct connection *conn) 
	switch (conn->llcp_length.state) {

	case LLCP_LENGTH_STATE_REQ:

	{

		struct pdu_data_llctrl_length_req_rsp *lr;

		struct pdu_data_llctrl_length_req *lr;

		struct radio_pdu_node_tx *node_tx;

		struct pdu_data *pdu_ctrl_tx;

		u16_t free_count_rx;
@@ -7367,12 +7366,11 @@ static inline void event_len_prep(struct connection *conn) 
		pdu_ctrl_tx = (struct pdu_data *) node_tx->pdu_data;

		pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL;

		pdu_ctrl_tx->len = offsetof(struct pdu_data_llctrl, ctrldata) +

			sizeof(struct pdu_data_llctrl_length_req_rsp);

			sizeof(struct pdu_data_llctrl_length_req);

		pdu_ctrl_tx->payload.llctrl.opcode =

			PDU_DATA_LLCTRL_TYPE_LENGTH_REQ;



		lr = (struct pdu_data_llctrl_length_req_rsp *)

			&pdu_ctrl_tx->payload.llctrl.ctrldata.length_req;

		lr = (void *)&pdu_ctrl_tx->payload.llctrl.ctrldata.length_req;

		lr->max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MAX;

		lr->max_tx_octets = conn->default_tx_octets;

		lr->max_rx_time = RADIO_PKT_TIME(RADIO_LL_LENGTH_OCTETS_RX_MAX,
@@ -7394,7 +7392,7 @@ static inline void event_len_prep(struct connection *conn) 


	case LLCP_LENGTH_STATE_RESIZE:

	{

		struct pdu_data_llctrl_length_req_rsp *lr;

		struct pdu_data_llctrl_length_rsp *lr;

		struct radio_pdu_node_rx *node_rx;

		struct pdu_data *pdu_ctrl_rx;

		u16_t packet_rx_data_size;
@@ -7525,12 +7523,11 @@ static inline void event_len_prep(struct connection *conn) 
		pdu_ctrl_rx->ll_id = PDU_DATA_LLID_CTRL;

		pdu_ctrl_rx->len = offsetof(struct pdu_data_llctrl,

					    ctrldata) +

			sizeof(struct pdu_data_llctrl_length_req_rsp);

			sizeof(struct pdu_data_llctrl_length_rsp);

		pdu_ctrl_rx->payload.llctrl.opcode =

			PDU_DATA_LLCTRL_TYPE_LENGTH_RSP;



		lr = (struct pdu_data_llctrl_length_req_rsp *)

			&pdu_ctrl_rx->payload.llctrl.ctrldata.length_req;

		lr = (void *)&pdu_ctrl_rx->payload.llctrl.ctrldata.length_rsp;

		lr->max_rx_octets = conn->max_rx_octets;

		lr->max_tx_octets = conn->max_tx_octets;

#if !defined(CONFIG_BT_CTLR_PHY)
@@ -7564,7 +7561,7 @@ static inline void event_phy_req_prep(struct connection *conn) 
	switch (conn->llcp_phy.state) {

	case LLCP_PHY_STATE_REQ:

	{

		struct pdu_data_llctrl_phy_req_rsp *pr;

		struct pdu_data_llctrl_phy_req *pr;

		struct radio_pdu_node_tx *node_tx;

		struct pdu_data *pdu_ctrl_tx;
@@ -7584,12 +7581,11 @@ static inline void event_phy_req_prep(struct connection *conn) 
		pdu_ctrl_tx = (struct pdu_data *) node_tx->pdu_data;

		pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL;

		pdu_ctrl_tx->len = offsetof(struct pdu_data_llctrl, ctrldata) +

				   sizeof(struct pdu_data_llctrl_phy_req_rsp);

				   sizeof(struct pdu_data_llctrl_phy_req);

		pdu_ctrl_tx->payload.llctrl.opcode =

			PDU_DATA_LLCTRL_TYPE_PHY_REQ;



		pr = (struct pdu_data_llctrl_phy_req_rsp *)

		     &pdu_ctrl_tx->payload.llctrl.ctrldata.phy_req;

		pr = (void *)&pdu_ctrl_tx->payload.llctrl.ctrldata.phy_req;

		pr->tx_phys = conn->llcp_phy.tx;

		pr->rx_phys = conn->llcp_phy.rx;
@@ -9463,7 +9459,7 @@ static void length_resp_send(struct connection *conn, 
	pdu_ctrl_tx = (struct pdu_data *) node_tx->pdu_data;

	pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL;

	pdu_ctrl_tx->len = offsetof(struct pdu_data_llctrl, ctrldata) +

		sizeof(struct pdu_data_llctrl_length_req_rsp);

		sizeof(struct pdu_data_llctrl_length_rsp);

	pdu_ctrl_tx->payload.llctrl.opcode =

		PDU_DATA_LLCTRL_TYPE_LENGTH_RSP;

	pdu_ctrl_tx->payload.llctrl.ctrldata.length_rsp.max_rx_octets =
@@ -9490,7 +9486,7 @@ static void length_resp_send(struct connection *conn, 
#if defined(CONFIG_BT_CTLR_PHY)

static u8_t phy_rsp_send(struct connection *conn, struct pdu_data *pdu_data_rx)

{

	struct pdu_data_llctrl_phy_req_rsp *p;

	struct pdu_data_llctrl_phy_req *p;

	struct radio_pdu_node_tx *node_tx;

	struct pdu_data *pdu_ctrl_tx;

	struct pdu_data_llctrl *c;
@@ -9530,7 +9526,7 @@ static u8_t phy_rsp_send(struct connection *conn, struct pdu_data *pdu_data_rx) 
	pdu_ctrl_tx = (struct pdu_data *)node_tx->pdu_data;

	pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL;

	pdu_ctrl_tx->len = offsetof(struct pdu_data_llctrl, ctrldata) +

			   sizeof(struct pdu_data_llctrl_phy_req_rsp);

			   sizeof(struct pdu_data_llctrl_phy_req);

	pdu_ctrl_tx->payload.llctrl.opcode = PDU_DATA_LLCTRL_TYPE_PHY_RSP;

	pdu_ctrl_tx->payload.llctrl.ctrldata.phy_rsp.tx_phys =

		conn->phy_pref_tx;

subsys/bluetooth/controller/ll_sw/pdu.h

+53 −7
Original line number Diff line number Diff line
@@ -224,6 +224,14 @@ struct pdu_data_llctrl_enc_rsp { 
	u8_t ivs[4];

} __packed;



struct pdu_data_llctrl_start_enc_req {

	/* no members */

} __packed;



struct pdu_data_llctrl_start_enc_rsp {

	/* no members */

} __packed;



struct pdu_data_llctrl_unknown_rsp {

	u8_t type;

} __packed;
@@ -236,6 +244,14 @@ struct pdu_data_llctrl_feature_rsp { 
	u8_t features[8];

} __packed;



struct pdu_data_llctrl_pause_enc_req {

	/* no members */

} __packed;



struct pdu_data_llctrl_pause_enc_rsp {

	/* no members */

} __packed;



struct pdu_data_llctrl_version_ind {

	u8_t  version_number;

	u16_t company_id;
@@ -246,6 +262,10 @@ struct pdu_data_llctrl_reject_ind { 
	u8_t error_code;

} __packed;



struct pdu_data_llctrl_slave_feature_req {

	u8_t features[8];

} __packed;



struct pdu_data_llctrl_conn_param_req {

	u16_t interval_min;

	u16_t interval_max;
@@ -281,14 +301,34 @@ struct pdu_data_llctrl_reject_ext_ind { 
	u8_t error_code;

} __packed;



struct pdu_data_llctrl_length_req_rsp {

struct pdu_data_llctrl_ping_req {

	/* no members */

} __packed;



struct pdu_data_llctrl_ping_rsp {

	/* no members */

} __packed;



struct pdu_data_llctrl_length_req {

	u16_t max_rx_octets;

	u16_t max_rx_time;

	u16_t max_tx_octets;

	u16_t max_tx_time;

} __packed;



struct pdu_data_llctrl_length_rsp {

	u16_t max_rx_octets;

	u16_t max_rx_time;

	u16_t max_tx_octets;

	u16_t max_tx_time;

} __packed;



struct pdu_data_llctrl_phy_req_rsp {

struct pdu_data_llctrl_phy_req {

	u8_t tx_phys;

	u8_t rx_phys;

} __packed;



struct pdu_data_llctrl_phy_rsp {

	u8_t tx_phys;

	u8_t rx_phys;

} __packed;
@@ -312,19 +352,25 @@ struct pdu_data_llctrl { 
		struct pdu_data_llctrl_terminate_ind terminate_ind;

		struct pdu_data_llctrl_enc_req enc_req;

		struct pdu_data_llctrl_enc_rsp enc_rsp;

		struct pdu_data_llctrl_start_enc_req start_enc_req;

		struct pdu_data_llctrl_start_enc_rsp start_enc_rsp;

		struct pdu_data_llctrl_unknown_rsp unknown_rsp;

		struct pdu_data_llctrl_feature_req feature_req;

		struct pdu_data_llctrl_feature_rsp feature_rsp;

		struct pdu_data_llctrl_pause_enc_req pause_enc_req;

		struct pdu_data_llctrl_pause_enc_rsp pause_enc_rsp;

		struct pdu_data_llctrl_version_ind version_ind;

		struct pdu_data_llctrl_reject_ind reject_ind;

		struct pdu_data_llctrl_feature_req slave_feature_req;

		struct pdu_data_llctrl_slave_feature_req slave_feature_req;

		struct pdu_data_llctrl_conn_param_req conn_param_req;

		struct pdu_data_llctrl_conn_param_rsp conn_param_rsp;

		struct pdu_data_llctrl_reject_ext_ind reject_ext_ind;

		struct pdu_data_llctrl_length_req_rsp length_req;

		struct pdu_data_llctrl_length_req_rsp length_rsp;

		struct pdu_data_llctrl_phy_req_rsp phy_req;

		struct pdu_data_llctrl_phy_req_rsp phy_rsp;

		struct pdu_data_llctrl_ping_req ping_req;

		struct pdu_data_llctrl_ping_rsp ping_rsp;

		struct pdu_data_llctrl_length_req length_req;

		struct pdu_data_llctrl_length_rsp length_rsp;

		struct pdu_data_llctrl_phy_req phy_req;

		struct pdu_data_llctrl_phy_rsp phy_rsp;

		struct pdu_data_llctrl_phy_upd_ind phy_upd_ind;

		struct pdu_data_llctrl_min_used_chans_ind min_used_chans_ind;

	} __packed ctrldata;

CRA Git | Maintained and supported by SUSTech CRA and CCSE