Commit 1325edff authored by Carles Cufi's avatar Carles Cufi
Browse files

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

doc/releases/release-notes-2.7.rst

+29 −0
Original line number Diff line number Diff line
@@ -50,6 +50,35 @@ Deprecated in this release 
  :c:func:`bt_le_filter_accept_list_remove`

  :c:func:`bt_le_filter_accept_list_clear`



Modified in this release



* The following Bluetooth macros and structures in :file:`hci.h` have been

  modified to align with the inclusive naming in the v5.3 specification:



  * ``BT_LE_FEAT_BIT_SLAVE_FEAT_REQ`` is now ``BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG``

  * ``BT_LE_FEAT_BIT_CIS_MASTER`` is now ``BT_LE_FEAT_BIT_CIS_CENTRAL``

  * ``BT_LE_FEAT_BIT_CIS_SLAVE`` is now ``BT_LE_FEAT_BIT_CIS_PERIPHERAL``

  * ``BT_FEAT_LE_SLAVE_FEATURE_XCHG`` is now ``BT_FEAT_LE_PER_INIT_FEAT_XCHG``

  * ``BT_FEAT_LE_CIS_MASTER`` is now ``BT_FEAT_LE_CIS_CENTRAL``

  * ``BT_FEAT_LE_CIS_SLAVE`` is now ``BT_FEAT_LE_CIS_PERIPHERAL``

  * ``BT_LE_STATES_SLAVE_CONN_ADV`` is now ``BT_LE_STATES_PER_CONN_ADV``

  * ``BT_HCI_OP_LE_READ_WL_SIZE`` is now ``BT_HCI_OP_LE_READ_FAL_SIZE``

  * ``bt_hci_rp_le_read_wl_size`` is now ``bt_hci_rp_le_read_fal_size``

  * ``bt_hci_rp_le_read_wl_size::wl_size`` is now ``bt_hci_rp_le_read_fal_size::fal_size``

  * ``BT_HCI_OP_LE_CLEAR_WL`` is now ``BT_HCI_OP_LE_CLEAR_FAL``

  * ``BT_HCI_OP_LE_ADD_DEV_TO_WL`` is now ``BT_HCI_OP_LE_REM_DEV_FROM_FAL``

  * ``bt_hci_cp_le_add_dev_to_wl`` is now ``bt_hci_cp_le_add_dev_to_fal``

  * ``BT_HCI_OP_LE_REM_DEV_FROM_WL`` is now ``BT_HCI_OP_LE_REM_DEV_FROM_FAL``

  * ``bt_hci_cp_le_rem_dev_from_wl`` is now ``bt_hci_cp_le_rem_dev_from_fal``

  * ``BT_HCI_ROLE_MASTER`` is now ``BT_HCI_ROLE_CENTRAL``

  * ``BT_HCI_ROLE_SLAVE`` is now ``BT_HCI_ROLE_PERIPHERAL``

  * ``BT_EVT_MASK_CL_SLAVE_BC_RX`` is now ``BT_EVT_MASK_CL_PER_BC_RX``

  * ``BT_EVT_MASK_CL_SLAVE_BC_TIMEOUT`` is now ``BT_EVT_MASK_CL_PER_BC_TIMEOUT``

  * ``BT_EVT_MASK_SLAVE_PAGE_RSP_TIMEOUT`` is now ``BT_EVT_MASK_PER_PAGE_RSP_TIMEOUT``

  * ``BT_EVT_MASK_CL_SLAVE_BC_CH_MAP_CHANGE`` is now ``BT_EVT_MASK_CL_PER_BC_CH_MAP_CHANGE``

  * ``m_*`` structure members are now ``c_*``

  * ``s_*`` structure members are now ``p_*``



Changes in this release

==========================

include/bluetooth/hci.h

+68 −66
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ struct bt_hci_cmd_hdr { 
#define BT_LE_FEAT_BIT_ENC                      0

#define BT_LE_FEAT_BIT_CONN_PARAM_REQ           1

#define BT_LE_FEAT_BIT_EXT_REJ_IND              2

#define BT_LE_FEAT_BIT_SLAVE_FEAT_REQ           3

#define BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG       3

#define BT_LE_FEAT_BIT_PING                     4

#define BT_LE_FEAT_BIT_DLE                      5

#define BT_LE_FEAT_BIT_PRIVACY                  6
@@ -157,8 +157,8 @@ struct bt_hci_cmd_hdr { 
#define BT_LE_FEAT_BIT_PAST_RECV                25

#define BT_LE_FEAT_BIT_SCA_UPDATE               26

#define BT_LE_FEAT_BIT_REMOTE_PUB_KEY_VALIDATE  27

#define BT_LE_FEAT_BIT_CIS_MASTER               28

#define BT_LE_FEAT_BIT_CIS_SLAVE                29

#define BT_LE_FEAT_BIT_CIS_CENTRAL              28

#define BT_LE_FEAT_BIT_CIS_PERIPHERAL           29

#define BT_LE_FEAT_BIT_ISO_BROADCASTER          30

#define BT_LE_FEAT_BIT_SYNC_RECEIVER            31

#define BT_LE_FEAT_BIT_ISO_CHANNELS             32
@@ -173,8 +173,8 @@ struct bt_hci_cmd_hdr { 
						BT_LE_FEAT_BIT_ENC)

#define BT_FEAT_LE_CONN_PARAM_REQ_PROC(feat)    BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_CONN_PARAM_REQ)

#define BT_FEAT_LE_SLAVE_FEATURE_XCHG(feat)     BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_SLAVE_FEAT_REQ)

#define BT_FEAT_LE_PER_INIT_FEAT_XCHG(feat)     BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG)

#define BT_FEAT_LE_DLE(feat)                    BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_DLE)

#define BT_FEAT_LE_PHY_2M(feat)                 BT_LE_FEAT_TEST(feat, \
@@ -205,10 +205,10 @@ struct bt_hci_cmd_hdr { 
						BT_LE_FEAT_BIT_PAST_SEND)

#define BT_FEAT_LE_PAST_RECV(feat)              BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_PAST_RECV)

#define BT_FEAT_LE_CIS_MASTER(feat)             BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_CIS_MASTER)

#define BT_FEAT_LE_CIS_SLAVE(feat)              BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_CIS_SLAVE)

#define BT_FEAT_LE_CIS_CENTRAL(feat)            BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_CIS_CENTRAL)

#define BT_FEAT_LE_CIS_PERIPHERAL(feat)         BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_CIS_PERIPHERAL)

#define BT_FEAT_LE_ISO_BROADCASTER(feat)        BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_ISO_BROADCASTER)

#define BT_FEAT_LE_SYNC_RECEIVER(feat)          BT_LE_FEAT_TEST(feat, \
@@ -216,15 +216,15 @@ struct bt_hci_cmd_hdr { 
#define BT_FEAT_LE_ISO_CHANNELS(feat)           BT_LE_FEAT_TEST(feat, \

						BT_LE_FEAT_BIT_ISO_CHANNELS)



#define BT_FEAT_LE_CIS(feat)            (BT_FEAT_LE_CIS_MASTER(feat) | \

					BT_FEAT_LE_CIS_SLAVE(feat))

#define BT_FEAT_LE_CIS(feat)            (BT_FEAT_LE_CIS_CENTRAL(feat) | \

					BT_FEAT_LE_CIS_PERIPHERAL(feat))

#define BT_FEAT_LE_BIS(feat)            (BT_FEAT_LE_ISO_BROADCASTER(feat) | \

					BT_FEAT_LE_SYNC_RECEIVER(feat))

#define BT_FEAT_LE_ISO(feat)            (BT_FEAT_LE_CIS(feat) | \

					BT_FEAT_LE_BIS(feat))



/* LE States */

#define BT_LE_STATES_SLAVE_CONN_ADV(states)     (states & 0x0000004000000000)

#define BT_LE_STATES_PER_CONN_ADV(states)     (states & 0x0000004000000000)



/* Bonding/authentication types */

#define BT_HCI_NO_BONDING                       0x00
@@ -843,10 +843,10 @@ struct bt_hci_cp_le_set_random_address { 
#define BT_LE_ADV_CHAN_MAP_CHAN_39              0x04

#define BT_LE_ADV_CHAN_MAP_ALL                  0x07



#define BT_LE_ADV_FP_NO_WHITELIST               0x00

#define BT_LE_ADV_FP_WHITELIST_SCAN_REQ         0x01

#define BT_LE_ADV_FP_WHITELIST_CONN_IND         0x02

#define BT_LE_ADV_FP_WHITELIST_BOTH             0x03

#define BT_LE_ADV_FP_NO_FILTER                  0x00

#define BT_LE_ADV_FP_FILTER_SCAN_REQ            0x01

#define BT_LE_ADV_FP_FILTER_CONN_IND            0x02

#define BT_LE_ADV_FP_FILTER_BOTH                0x03



#define BT_HCI_OP_LE_SET_ADV_PARAM              BT_OP(BT_OGF_LE, 0x0006)

struct bt_hci_cp_le_set_adv_param {
@@ -890,8 +890,10 @@ struct bt_hci_cp_le_set_adv_enable { 
#define BT_HCI_LE_SCAN_PASSIVE                  0x00

#define BT_HCI_LE_SCAN_ACTIVE                   0x01



#define BT_HCI_LE_SCAN_FP_NO_WHITELIST          0x00

#define BT_HCI_LE_SCAN_FP_USE_WHITELIST         0x01

#define BT_HCI_LE_SCAN_FP_BASIC_NO_FILTER       0x00

#define BT_HCI_LE_SCAN_FP_BASIC_FILTER          0x01

#define BT_HCI_LE_SCAN_FP_EXT_NO_FILTER         0x02

#define BT_HCI_LE_SCAN_FP_EXT_FILTER            0x03



struct bt_hci_cp_le_set_scan_param {

	uint8_t  scan_type;
@@ -916,8 +918,8 @@ struct bt_hci_cp_le_set_scan_enable { 


#define BT_HCI_OP_LE_CREATE_CONN                BT_OP(BT_OGF_LE, 0x000d)



#define BT_HCI_LE_CREATE_CONN_FP_DIRECT         0x00

#define BT_HCI_LE_CREATE_CONN_FP_WHITELIST      0x01

#define BT_HCI_LE_CREATE_CONN_FP_NO_FILTER      0x00

#define BT_HCI_LE_CREATE_CONN_FP_FILTER         0x01



struct bt_hci_cp_le_create_conn {

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


#define BT_HCI_OP_LE_CREATE_CONN_CANCEL         BT_OP(BT_OGF_LE, 0x000e)



#define BT_HCI_OP_LE_READ_WL_SIZE               BT_OP(BT_OGF_LE, 0x000f)

struct bt_hci_rp_le_read_wl_size {

#define BT_HCI_OP_LE_READ_FAL_SIZE               BT_OP(BT_OGF_LE, 0x000f)

struct bt_hci_rp_le_read_fal_size {

	uint8_t  status;

	uint8_t  wl_size;

	uint8_t  fal_size;

} __packed;



#define BT_HCI_OP_LE_CLEAR_WL                   BT_OP(BT_OGF_LE, 0x0010)

#define BT_HCI_OP_LE_CLEAR_FAL                   BT_OP(BT_OGF_LE, 0x0010)



#define BT_HCI_OP_LE_ADD_DEV_TO_WL              BT_OP(BT_OGF_LE, 0x0011)

struct bt_hci_cp_le_add_dev_to_wl {

#define BT_HCI_OP_LE_ADD_DEV_TO_FAL              BT_OP(BT_OGF_LE, 0x0011)

struct bt_hci_cp_le_add_dev_to_fal {

	bt_addr_le_t  addr;

} __packed;



#define BT_HCI_OP_LE_REM_DEV_FROM_WL            BT_OP(BT_OGF_LE, 0x0012)

struct bt_hci_cp_le_rem_dev_from_wl {

#define BT_HCI_OP_LE_REM_DEV_FROM_FAL            BT_OP(BT_OGF_LE, 0x0012)

struct bt_hci_cp_le_rem_dev_from_fal {

	bt_addr_le_t  addr;

} __packed;
@@ -1729,23 +1731,23 @@ struct bt_hci_rp_le_read_iso_tx_sync { 
#define BT_HCI_OP_LE_SET_CIG_PARAMS             BT_OP(BT_OGF_LE, 0x0062)

struct bt_hci_cis_params {

	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;

} __packed;



struct bt_hci_cp_le_set_cig_params {

	uint8_t  cig_id;

	uint8_t  m_interval[3];

	uint8_t  s_interval[3];

	uint8_t  c_interval[3];

	uint8_t  p_interval[3];

	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;

	struct bt_hci_cis_params cis[0];

} __packed;
@@ -1761,22 +1763,22 @@ struct bt_hci_rp_le_set_cig_params { 
struct bt_hci_cis_params_test {

	uint8_t  cis_id;

	uint8_t  nse;

	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;

} __packed;



struct bt_hci_cp_le_set_cig_params_test {

	uint8_t  cig_id;

	uint8_t  m_interval[3];

	uint8_t  s_interval[3];

	uint8_t  m_ft;

	uint8_t  s_ft;

	uint8_t  c_interval[3];

	uint8_t  p_interval[3];

	uint8_t  c_ft;

	uint8_t  p_ft;

	uint16_t iso_interval;

	uint8_t  sca;

	uint8_t  packing;
@@ -2237,8 +2239,8 @@ struct bt_hci_evt_auth_payload_timeout_exp { 
	uint16_t handle;

} __packed;



#define BT_HCI_ROLE_MASTER                      0x00

#define BT_HCI_ROLE_SLAVE                       0x01

#define BT_HCI_ROLE_CENTRAL                     0x00

#define BT_HCI_ROLE_PERIPHERAL                  0x01



#define BT_HCI_EVT_LE_CONN_COMPLETE             0x01

struct bt_hci_evt_le_conn_complete {
@@ -2505,17 +2507,17 @@ struct bt_hci_evt_le_cis_established { 
	uint16_t conn_handle;

	uint8_t  cig_sync_delay[3];

	uint8_t  cis_sync_delay[3];

	uint8_t  m_latency[3];

	uint8_t  s_latency[3];

	uint8_t  m_phy;

	uint8_t  s_phy;

	uint8_t  c_latency[3];

	uint8_t  p_latency[3];

	uint8_t  c_phy;

	uint8_t  p_phy;

	uint8_t  nse;

	uint8_t  m_bn;

	uint8_t  s_bn;

	uint8_t  m_ft;

	uint8_t  s_ft;

	uint16_t m_max_pdu;

	uint16_t s_max_pdu;

	uint8_t  c_bn;

	uint8_t  p_bn;

	uint8_t  c_ft;

	uint8_t  p_ft;

	uint16_t c_max_pdu;

	uint16_t p_max_pdu;

	uint16_t interval;

} __packed;
@@ -2632,11 +2634,11 @@ struct bt_hci_evt_le_biginfo_adv_report { 
#define BT_EVT_MASK_TRIGG_CLOCK_CAPTURE          BT_EVT_BIT(14)

#define BT_EVT_MASK_SYNCH_TRAIN_COMPLETE         BT_EVT_BIT(15)

#define BT_EVT_MASK_SYNCH_TRAIN_RX               BT_EVT_BIT(16)

#define BT_EVT_MASK_CL_SLAVE_BC_RX               BT_EVT_BIT(17)

#define BT_EVT_MASK_CL_SLAVE_BC_TIMEOUT          BT_EVT_BIT(18)

#define BT_EVT_MASK_CL_PER_BC_RX                 BT_EVT_BIT(17)

#define BT_EVT_MASK_CL_PER_BC_TIMEOUT            BT_EVT_BIT(18)

#define BT_EVT_MASK_TRUNC_PAGE_COMPLETE          BT_EVT_BIT(19)

#define BT_EVT_MASK_SLAVE_PAGE_RSP_TIMEOUT       BT_EVT_BIT(20)

#define BT_EVT_MASK_CL_SLAVE_BC_CH_MAP_CHANGE    BT_EVT_BIT(21)

#define BT_EVT_MASK_PER_PAGE_RSP_TIMEOUT         BT_EVT_BIT(20)

#define BT_EVT_MASK_CL_PER_BC_CH_MAP_CHANGE      BT_EVT_BIT(21)

#define BT_EVT_MASK_INQUIRY_RSP_NOT              BT_EVT_BIT(22)

#define BT_EVT_MASK_AUTH_PAYLOAD_TIMEOUT_EXP     BT_EVT_BIT(23)

#define BT_EVT_MASK_SAM_STATUS_CHANGE            BT_EVT_BIT(24)

subsys/bluetooth/controller/hci/hci.c

+56 −56
Original line number Diff line number Diff line
@@ -1232,12 +1232,12 @@ static void le_set_random_address(struct net_buf *buf, struct net_buf **evt) 
#if defined(CONFIG_BT_CTLR_FILTER)

static void le_read_wl_size(struct net_buf *buf, struct net_buf **evt)

{

	struct bt_hci_rp_le_read_wl_size *rp;

	struct bt_hci_rp_le_read_fal_size *rp;



	rp = hci_cmd_complete(evt, sizeof(*rp));

	rp->status = 0x00;



	rp->wl_size = ll_wl_size_get();

	rp->fal_size = ll_wl_size_get();

}



static void le_clear_wl(struct net_buf *buf, struct net_buf **evt)
@@ -1251,7 +1251,7 @@ static void le_clear_wl(struct net_buf *buf, struct net_buf **evt) 


static void le_add_dev_to_wl(struct net_buf *buf, struct net_buf **evt)

{

	struct bt_hci_cp_le_add_dev_to_wl *cmd = (void *)buf->data;

	struct bt_hci_cp_le_add_dev_to_fal *cmd = (void *)buf->data;

	uint8_t status;



	status = ll_wl_add(&cmd->addr);
@@ -1261,7 +1261,7 @@ static void le_add_dev_to_wl(struct net_buf *buf, struct net_buf **evt) 


static void le_rem_dev_from_wl(struct net_buf *buf, struct net_buf **evt)

{

	struct bt_hci_cp_le_rem_dev_from_wl *cmd = (void *)buf->data;

	struct bt_hci_cp_le_rem_dev_from_fal *cmd = (void *)buf->data;

	uint8_t status;



	status = ll_wl_remove(&cmd->addr);
@@ -1769,22 +1769,22 @@ static void le_set_cig_parameters(struct net_buf *buf, struct net_buf **evt) 
{

	struct bt_hci_cp_le_set_cig_params *cmd = (void *)buf->data;

	struct bt_hci_rp_le_set_cig_params *rp;

	uint32_t m_interval;

	uint32_t s_interval;

	uint16_t m_latency;

	uint16_t s_latency;

	uint32_t c_interval;

	uint32_t p_interval;

	uint16_t c_latency;

	uint16_t p_latency;

	uint8_t status;

	uint8_t i;



	m_interval = sys_get_le24(cmd->m_interval);

	s_interval = sys_get_le24(cmd->s_interval);

	m_latency = sys_le16_to_cpu(cmd->m_latency);

	s_latency = sys_le16_to_cpu(cmd->s_latency);

	c_interval = sys_get_le24(cmd->c_interval);

	p_interval = sys_get_le24(cmd->p_interval);

	c_latency = sys_le16_to_cpu(cmd->c_latency);

	p_latency = sys_le16_to_cpu(cmd->p_latency);



	/* Create CIG or start modifying existing CIG */

	status = ll_cig_parameters_open(cmd->cig_id, m_interval, s_interval,

	status = ll_cig_parameters_open(cmd->cig_id, c_interval, p_interval,

					cmd->sca, cmd->packing, cmd->framing,

					m_latency, s_latency, cmd->num_cis);

					c_latency, p_latency, cmd->num_cis);



	rp = hci_cmd_complete(evt, sizeof(*rp) +

				   cmd->num_cis * sizeof(uint16_t));
@@ -1795,15 +1795,15 @@ static void le_set_cig_parameters(struct net_buf *buf, struct net_buf **evt) 
	for (i = 0; !status && i < cmd->num_cis; i++) {

		struct bt_hci_cis_params *params = cmd->cis;

		uint16_t handle;

		uint16_t m_sdu;

		uint16_t s_sdu;

		uint16_t c_sdu;

		uint16_t p_sdu;



		m_sdu = sys_le16_to_cpu(params->m_sdu);

		s_sdu = sys_le16_to_cpu(params->s_sdu);

		c_sdu = sys_le16_to_cpu(params->c_sdu);

		p_sdu = sys_le16_to_cpu(params->p_sdu);



		status = ll_cis_parameters_set(params->cis_id, m_sdu, s_sdu,

					       params->m_phy, params->s_phy,

					       params->m_rtn, params->s_rtn,

		status = ll_cis_parameters_set(params->cis_id, c_sdu, p_sdu,

					       params->c_phy, params->p_phy,

					       params->c_rtn, params->p_rtn,

					       &handle);

		rp->handle[i] = sys_cpu_to_le16(handle);

	}
@@ -1821,20 +1821,20 @@ static void le_set_cig_params_test(struct net_buf *buf, struct net_buf **evt) 
	struct bt_hci_cp_le_set_cig_params_test *cmd = (void *)buf->data;

	struct bt_hci_rp_le_set_cig_params_test *rp;



	uint32_t m_interval;

	uint32_t s_interval;

	uint32_t c_interval;

	uint32_t p_interval;

	uint16_t iso_interval;

	uint8_t status;

	uint8_t i;



	m_interval = sys_get_le24(cmd->m_interval);

	s_interval = sys_get_le24(cmd->s_interval);

	c_interval = sys_get_le24(cmd->c_interval);

	p_interval = sys_get_le24(cmd->p_interval);

	iso_interval = sys_le16_to_cpu(cmd->iso_interval);



	/* Create CIG or start modifying existing CIG */

	status = ll_cig_parameters_test_open(cmd->cig_id, m_interval,

					     s_interval, cmd->m_ft,

					     cmd->s_ft, iso_interval,

	status = ll_cig_parameters_test_open(cmd->cig_id, c_interval,

					     p_interval, cmd->c_ft,

					     cmd->p_ft, iso_interval,

					     cmd->sca, cmd->packing,

					     cmd->framing,

					     cmd->num_cis);
@@ -1848,23 +1848,23 @@ static void le_set_cig_params_test(struct net_buf *buf, struct net_buf **evt) 
	for (i = 0; !status && i < cmd->num_cis; i++) {

		struct bt_hci_cis_params_test *params = cmd->cis;

		uint16_t handle;

		uint16_t m_sdu;

		uint16_t s_sdu;

		uint16_t m_pdu;

		uint16_t s_pdu;

		uint16_t c_sdu;

		uint16_t p_sdu;

		uint16_t c_pdu;

		uint16_t p_pdu;



		m_sdu = sys_le16_to_cpu(params->m_sdu);

		s_sdu = sys_le16_to_cpu(params->s_sdu);

		m_pdu = sys_le16_to_cpu(params->m_pdu);

		s_pdu = sys_le16_to_cpu(params->s_pdu);

		c_sdu = sys_le16_to_cpu(params->c_sdu);

		p_sdu = sys_le16_to_cpu(params->p_sdu);

		c_pdu = sys_le16_to_cpu(params->c_pdu);

		p_pdu = sys_le16_to_cpu(params->p_pdu);



		status = ll_cis_parameters_test_set(params->cis_id,

						    m_sdu, s_sdu,

						    m_pdu, s_pdu,

						    params->m_phy,

						    params->s_phy,

						    params->m_bn,

						    params->s_bn,

						    c_sdu, p_sdu,

						    c_pdu, p_pdu,

						    params->c_phy,

						    params->p_phy,

						    params->c_bn,

						    params->p_bn,

						    &handle);

		rp->handle[i] = sys_cpu_to_le16(handle);

	}
@@ -3507,17 +3507,17 @@ static void le_cis_established(struct pdu_data *pdu_data, 
	sep->conn_handle = sys_cpu_to_le16(est->cis_handle);

	sys_put_le24(cig->sync_delay, sep->cig_sync_delay);

	sys_put_le24(cis->sync_delay, sep->cis_sync_delay);

	sys_put_le24(cig->c_latency, sep->m_latency);

	sys_put_le24(cig->p_latency, sep->s_latency);

	sep->m_phy = lll_cis_c->phy;

	sep->s_phy = lll_cis_p->phy;

	sys_put_le24(cig->c_latency, sep->c_latency);

	sys_put_le24(cig->p_latency, sep->p_latency);

	sep->c_phy = lll_cis_c->phy;

	sep->p_phy = lll_cis_p->phy;

	sep->nse = lll_cis->num_subevents;

	sep->m_bn = lll_cis_c->burst_number;

	sep->s_bn = lll_cis_p->burst_number;

	sep->m_ft = lll_cis_c->flush_timeout;

	sep->s_ft = lll_cis_p->flush_timeout;

	sep->m_max_pdu = sys_cpu_to_le16(lll_cis_c->max_octets);

	sep->s_max_pdu = sys_cpu_to_le16(lll_cis_p->max_octets);

	sep->c_bn = lll_cis_c->burst_number;

	sep->p_bn = lll_cis_p->burst_number;

	sep->c_ft = lll_cis_c->flush_timeout;

	sep->p_ft = lll_cis_p->flush_timeout;

	sep->c_max_pdu = sys_cpu_to_le16(lll_cis_c->max_octets);

	sep->p_max_pdu = sys_cpu_to_le16(lll_cis_p->max_octets);

	sep->interval = sys_cpu_to_le16(cig->iso_interval);



#if defined(CONFIG_BT_CTLR_CENTRAL_ISO)
@@ -3555,19 +3555,19 @@ static int controller_cmd_handle(uint16_t ocf, struct net_buf *cmd, 
		break;



#if defined(CONFIG_BT_CTLR_FILTER)

	case BT_OCF(BT_HCI_OP_LE_READ_WL_SIZE):

	case BT_OCF(BT_HCI_OP_LE_READ_FAL_SIZE):

		le_read_wl_size(cmd, evt);

		break;



	case BT_OCF(BT_HCI_OP_LE_CLEAR_WL):

	case BT_OCF(BT_HCI_OP_LE_CLEAR_FAL):

		le_clear_wl(cmd, evt);

		break;



	case BT_OCF(BT_HCI_OP_LE_ADD_DEV_TO_WL):

	case BT_OCF(BT_HCI_OP_LE_ADD_DEV_TO_FAL):

		le_add_dev_to_wl(cmd, evt);

		break;



	case BT_OCF(BT_HCI_OP_LE_REM_DEV_FROM_WL):

	case BT_OCF(BT_HCI_OP_LE_REM_DEV_FROM_FAL):

		le_rem_dev_from_wl(cmd, evt);

		break;

#endif /* CONFIG_BT_CTLR_FILTER */

subsys/bluetooth/controller/include/ll_feat.h

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#endif /* !CONFIG_BT_CTLR_EXT_REJ_IND */



#if defined(CONFIG_BT_CTLR_SLAVE_FEAT_REQ)

#define LL_FEAT_BIT_SLAVE_FEAT_REQ BIT64(BT_LE_FEAT_BIT_SLAVE_FEAT_REQ)

#define LL_FEAT_BIT_SLAVE_FEAT_REQ BIT64(BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG)

#else /* !CONFIG_BT_CTLR_SLAVE_FEAT_REQ */

#define LL_FEAT_BIT_SLAVE_FEAT_REQ 0

#endif /* !CONFIG_BT_CTLR_SLAVE_FEAT_REQ */
@@ -162,13 +162,13 @@ 
#endif /* !CONFIG_BT_CTLR_DF && !CONFIG_BT_CTLR_DF_CTE_RX */



#if defined(CONFIG_BT_CTLR_CENTRAL_ISO)

#define LL_FEAT_BIT_CIS_CENTRAL BIT64(BT_LE_FEAT_BIT_CIS_MASTER)

#define LL_FEAT_BIT_CIS_CENTRAL BIT64(BT_LE_FEAT_BIT_CIS_CENTRAL)

#else /* !CONFIG_BT_CTLR_CENTRAL_ISO */

#define LL_FEAT_BIT_CIS_CENTRAL 0

#endif /* !CONFIG_BT_CTLR_CENTRAL_ISO */



#if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO)

#define LL_FEAT_BIT_CIS_PERIPHERAL BIT64(BT_LE_FEAT_BIT_CIS_SLAVE)

#define LL_FEAT_BIT_CIS_PERIPHERAL BIT64(BT_LE_FEAT_BIT_CIS_PERIPHERAL)

#else /* !CONFIG_BT_CTLR_PERIPHERAL_ISO */

#define LL_FEAT_BIT_CIS_PERIPHERAL 0

#endif /* !CONFIG_BT_CTLR_PERIPHERAL_ISO */

subsys/bluetooth/controller/ll_sw/ull_adv.c

+1 −1
Original line number Diff line number Diff line
@@ -2772,7 +2772,7 @@ static void init_set(struct ll_adv_set *adv) 
	adv->own_addr_type = BT_ADDR_LE_PUBLIC;

#endif /* CONFIG_BT_CTLR_PRIVACY */

	adv->lll.chan_map = BT_LE_ADV_CHAN_MAP_ALL;

	adv->lll.filter_policy = BT_LE_ADV_FP_NO_WHITELIST;

	adv->lll.filter_policy = BT_LE_ADV_FP_NO_FILTER;

#if defined(CONFIG_BT_CTLR_JIT_SCHEDULING)

	adv->delay_remain = ULL_ADV_RANDOM_DELAY;

#endif /* ONFIG_BT_CTLR_JIT_SCHEDULING */

CRA Git | Maintained and supported by SUSTech CRA and CCSE