Bluetooth: controller: remove dependency for slot reservation

The slot reservation code is only valid for the refactored LLCP;
a guard was in place to ensure that it was not compiled in for
legacy controller code. This commit removes this guard

Signed-off-by: Andries Kruithof <[email protected]>

Author: Andries Kruithof

subsys/bluetooth/controller/Kconfig.ll_sw_split

@@ -471,7 +471,7 @@ config BT_CTLR_CENTRAL_RESERVE_MAX
 
 config BT_CTLR_SLOT_RESERVATION_UPDATE
 	bool "Update event length reservation after PHY or DLE update"
-	depends on !BT_LL_SW_LLCP_LEGACY && (BT_CTLR_DATA_LENGTH || BT_CTLR_PHY)
+	depends on (BT_CTLR_DATA_LENGTH || BT_CTLR_PHY)
 	default y
 	help
 	  Updates the event length reservation after a completed Data Length Update

subsys/bluetooth/controller/ll_sw/ull_conn.c

@@ -1227,7 +1227,7 @@ void ull_conn_done(struct node_rx_event_done *done)
 		lazy = lll->latency_event + 1U;
 	}
 
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY) && defined(CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE)
+#if defined(CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE)
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH) || defined(CONFIG_BT_CTLR_PHY)
 	if (lll->evt_len_upd) {
 		uint32_t ready_delay, rx_time, tx_time, ticks_slot;
@@ -1268,10 +1268,10 @@ void ull_conn_done(struct node_rx_event_done *done)
 		conn->ull.ticks_slot = ticks_slot;
 	}
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH || CONFIG_BT_CTLR_PHY */
-#else /* !CONFIG_BT_LL_SW_LLCP_LEGACY && CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE */
+#else /* CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE */
 	ticks_slot_plus = 0;
 	ticks_slot_minus = 0;
-#endif /* !CONFIG_BT_LL_SW_LLCP_LEGACY && CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE */
+#endif /* CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE */
 
 	/* update conn ticker */
 	if (ticks_drift_plus || ticks_drift_minus ||
@@ -1976,8 +1976,12 @@ static int empty_data_start_release(struct ll_conn *conn, struct node_tx *tx)
 }
 #endif /* CONFIG_BT_CTLR_LLID_DATA_START_EMPTY */
 
+/*
+ * TODO: struct lll_conn *lll_conn gives a CI error that tag names
+ * must be unique. This may be a false positive
+ */
 #if defined(CONFIG_BT_CTLR_FORCE_MD_AUTO)
-static uint8_t force_md_cnt_calc(struct lll_conn *lll_conn, uint32_t tx_rate)
+static uint8_t force_md_cnt_calc(struct lll_conn *lll_connection, uint32_t tx_rate)
 {
 	uint32_t time_incoming, time_outgoing;
 	uint8_t force_md_cnt;
@@ -1986,15 +1990,15 @@ static uint8_t force_md_cnt_calc(struct lll_conn *lll_conn, uint32_t tx_rate)
 	uint8_t phy;
 
 #if defined(CONFIG_BT_CTLR_PHY)
-	phy = lll_conn->phy_tx;
-	phy_flags = lll_conn->phy_flags;
+	phy = lll_connection->phy_tx;
+	phy_flags = lll_connection->phy_flags;
 #else /* !CONFIG_BT_CTLR_PHY */
 	phy = PHY_1M;
 	phy_flags = 0U;
 #endif /* !CONFIG_BT_CTLR_PHY */
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-	mic_size = PDU_MIC_SIZE * lll_conn->enc_tx;
+	mic_size = PDU_MIC_SIZE * lll_connection->enc_tx;
 #else /* !CONFIG_BT_CTLR_LE_ENC */
 	mic_size = 0U;
 #endif /* !CONFIG_BT_CTLR_LE_ENC */