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: Carles Cufi <[email protected]>

Author: carlescufi

doc/releases/release-notes-2.7.rst

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;

subsys/bluetooth/controller/include/ll_feat.h

@@ -25,11 +25,11 @@
 #define LL_FEAT_BIT_EXT_REJ_IND 0
 #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_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 */
+#if defined(CONFIG_BT_CTLR_PER_INIT_FEAT_XCHG)
+#define LL_FEAT_BIT_PER_INIT_FEAT_XCHG BIT64(BT_LE_FEAT_BIT_PER_INIT_FEAT_XCHG)
+#else /* !CONFIG_BT_CTLR_PER_INIT_FEAT_XCHG */
+#define LL_FEAT_BIT_PER_INIT_FEAT_XCHG 0
+#endif /* !CONFIG_BT_CTLR_PER_INIT_FEAT_XCHG */
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
 #define LL_FEAT_BIT_PING BIT64(BT_LE_FEAT_BIT_PING)
@@ -205,7 +205,7 @@
 #define LL_FEAT                  (LL_FEAT_BIT_ENC | \
 				  LL_FEAT_BIT_CONN_PARAM_REQ | \
 				  LL_FEAT_BIT_EXT_REJ_IND | \
-				  LL_FEAT_BIT_SLAVE_FEAT_REQ | \
+				  LL_FEAT_BIT_PER_INIT_FEAT_XCHG | \
 				  LL_FEAT_BIT_PING | \
 				  LL_FEAT_BIT_DLE | \
 				  LL_FEAT_BIT_PRIVACY | \

subsys/bluetooth/controller/ll_sw/lll_central.h

@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-int lll_master_init(void);
-int lll_master_reset(void);
-void lll_master_prepare(void *param);
+int lll_central_init(void);
+int lll_central_reset(void);
+void lll_central_prepare(void *param);

subsys/bluetooth/controller/ll_sw/lll_conn.h

@@ -60,7 +60,7 @@ struct lll_conn {
 		struct {
 			uint8_t initiated:1;
 			uint8_t cancelled:1;
-		} master;
+		} central;
 #if defined(CONFIG_BT_PERIPHERAL)
 		struct {
 			uint8_t  initiated:1;
@@ -73,7 +73,7 @@ struct lll_conn {
 			uint32_t window_widening_event_us;
 			uint32_t window_size_prepare_us;
 			uint32_t window_size_event_us;
-		} slave;
+		} periph;
 #endif /* CONFIG_BT_PERIPHERAL */
 	};
 

subsys/bluetooth/controller/ll_sw/lll_slave.h renamed to subsys/bluetooth/controller/ll_sw/lll_peripheral.h

@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-int lll_slave_init(void);
-int lll_slave_reset(void);
-void lll_slave_prepare(void *param);
+int lll_periph_init(void);
+int lll_periph_reset(void);
+void lll_periph_prepare(void *param);

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c

@@ -856,7 +856,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 	 * transmitting connectable advertising event if cancelled flag is set.
 	 */
 	if (unlikely(lll->conn &&
-		(lll->conn->slave.initiated || lll->conn->slave.cancelled))) {
+		(lll->conn->periph.initiated || lll->conn->periph.cancelled))) {
 		radio_isr_set(lll_isr_early_abort, lll);
 		radio_disable();
 
@@ -1091,7 +1091,7 @@ static void isr_tx(void *param)
 	radio_tmr_hcto_configure(hcto);
 
 	/* capture end of CONNECT_IND PDU, used for calculating first
-	 * slave event.
+	 * peripheral event.
 	 */
 	radio_tmr_end_capture();
 
@@ -1205,7 +1205,7 @@ static void isr_done(void *param)
 	 */
 	if (lll->chan_map_curr &&
 #if defined(CONFIG_BT_PERIPHERAL)
-	    (!lll->conn || !lll->conn->slave.cancelled) &&
+	    (!lll->conn || !lll->conn->periph.cancelled) &&
 #endif /* CONFIG_BT_PERIPHERAL */
 	    1) {
 		struct pdu_adv *pdu;
@@ -1447,7 +1447,7 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 	 */
 	} else if ((pdu_rx->type == PDU_ADV_TYPE_CONNECT_IND) &&
 		   (pdu_rx->len == sizeof(struct pdu_adv_connect_ind)) &&
-		   lll->conn && !lll->conn->slave.cancelled &&
+		   lll->conn && !lll->conn->periph.cancelled &&
 		   lll_adv_connect_ind_check(lll, pdu_rx, tx_addr, addr,
 					     rx_addr, tgt_addr,
 					     devmatch_ok, &rl_idx)) {
@@ -1481,7 +1481,7 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 #endif /* CONFIG_BT_CTLR_CONN_RSSI */
 
 		/* Stop further LLL radio events */
-		lll->conn->slave.initiated = 1;
+		lll->conn->periph.initiated = 1;
 
 		rx = ull_pdu_rx_alloc();