Commit 947b38ac authored by Carles Cufi's avatar Carles Cufi
Browse files

Bluetooth: controller: Replace slave with peripheral 



Replace the old slave term with the new peripheral
one from the Bluetooth spec v5.3.

Signed-off-by: default avatarCarles Cufi <carles.cufi@nordicsemi.no>
parent ba2d2ee9

doc/releases/release-notes-2.7.rst

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ Modified in this release 


* The ``CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY`` Kconfig option is now

  :kconfig:`CONFIG_BT_PERIPHERAL_PREF_LATENCY`

* The ``CONFIG_BT_CTLR_SLAVE_FEAT_REQ_SUPPORT`` Kconfig option is now

  :kconfig:`CONFIG_BT_CTLR_PER_INIT_FEAT_XCHG_SUPPORT`

* The ``CONFIG_BT_CTLR_SLAVE_FEAT_REQ`` Kconfig option is now

  :kconfig:`CONFIG_BT_CTLR_PER_INIT_FEAT_XCHG`



Changes in this release

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

subsys/bluetooth/controller/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ if(CONFIG_BT_LL_SW_SPLIT) 
      )

    if(CONFIG_BT_PERIPHERAL)

      zephyr_library_sources(

        ll_sw/ull_slave.c

        ll_sw/ull_peripheral.c

      )

    zephyr_library_sources_ifdef(

        CONFIG_BT_CTLR_PERIPHERAL_ISO
@@ -82,7 +82,7 @@ if(CONFIG_BT_LL_SW_SPLIT) 
    endif()

    if(CONFIG_BT_CENTRAL)

      zephyr_library_sources(

        ll_sw/ull_master.c

        ll_sw/ull_central.c

        )

      zephyr_library_sources_ifdef(

        CONFIG_BT_CTLR_CENTRAL_ISO

subsys/bluetooth/controller/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config BT_CTLR_CONN_PARAM_REQ_SUPPORT 
config BT_CTLR_EXT_REJ_IND_SUPPORT

	bool



config BT_CTLR_SLAVE_FEAT_REQ_SUPPORT

config BT_CTLR_PER_INIT_FEAT_XCHG_SUPPORT

	bool



config BT_CTLR_DATA_LEN_UPDATE_SUPPORT
@@ -308,12 +308,12 @@ config BT_CTLR_EXT_REJ_IND 
	  Enable support for Bluetooth v4.1 Extended Reject Indication feature

	  in the Controller.



config BT_CTLR_SLAVE_FEAT_REQ

	bool "Slave-initiated Features Exchange"

	depends on BT_CTLR_SLAVE_FEAT_REQ_SUPPORT

config BT_CTLR_PER_INIT_FEAT_XCHG

	bool "Peripheral-initiated Features Exchange"

	depends on BT_CTLR_PER_INIT_FEAT_XCHG_SUPPORT

	default y

	help

	  Enable support for Bluetooth v4.1 Slave-initiated Features Exchange

	  Enable support for Bluetooth v4.1 Peripheral-initiated Features Exchange

	  feature in the Controller.



config BT_CTLR_LE_PING

subsys/bluetooth/controller/Kconfig.ll_sw_split

+7 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ config BT_LLL_VENDOR_NORDIC 
					 !BT_CTLR_PHY_2M_NRF

	select BT_CTLR_CONN_PARAM_REQ_SUPPORT

	select BT_CTLR_EXT_REJ_IND_SUPPORT

	select BT_CTLR_SLAVE_FEAT_REQ_SUPPORT

	select BT_CTLR_PER_INIT_FEAT_XCHG_SUPPORT

	select BT_CTLR_DATA_LEN_UPDATE_SUPPORT if HAS_HW_NRF_CCM_LFLEN_8BIT || \

						  BT_CTLR_DATA_LENGTH_CLEAR

	select BT_CTLR_PRIVACY_SUPPORT if !SOC_SERIES_NRF51X
@@ -307,15 +307,15 @@ config BT_CTLR_SCHED_ADVANCED 
	depends on (BT_MAX_CONN != 0) && BT_CTLR_SCHED_ADVANCED_SUPPORT

	default y if !(BT_PERIPHERAL && !BT_CENTRAL)

	help

	  Enable non-overlapping placement of observer, initiator and master

	  Enable non-overlapping placement of observer, initiator and central

	  roles in timespace. Uses window offset in connection updates and uses

	  connection parameter request in slave role to negotiate

	  non-overlapping placement with active master roles to avoid slave

	  roles drifting into active master roles in the local controller.

	  connection parameter request in peripheral role to negotiate

	  non-overlapping placement with active central roles to avoid peripheral

	  roles drifting into active central roles in the local controller.



	  This feature maximizes the average data transmission amongst active

	  concurrent master and slave connections while other observer,

	  initiator, master or slave roles are active in the local controller.

	  concurrent central and peripheral connections while other observer,

	  initiator, central or peripheral roles are active in the local controller.



	  Disabling this feature will lead to overlapping role in timespace

	  leading to skipped events amongst active roles.

subsys/bluetooth/controller/hci/hci.c

+1 −1
Original line number Diff line number Diff line
@@ -6345,7 +6345,7 @@ static void le_unknown_rsp(struct pdu_data *pdu_data, uint16_t handle, 
{



	switch (pdu_data->llctrl.unknown_rsp.type) {

	case PDU_DATA_LLCTRL_TYPE_SLAVE_FEATURE_REQ:

	case PDU_DATA_LLCTRL_TYPE_PER_INIT_FEAT_XCHG:

		le_remote_feat_complete(BT_HCI_ERR_UNSUPP_REMOTE_FEATURE,

					    NULL, handle, buf);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE