Bluetooth: controller: Fixes and use of defines related to initiator

Fixed incorrect LLL context used to generate done event for
auxiliary channel scanning. Other minor comments and fixes.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

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

@@ -153,24 +153,17 @@ void lll_scan_prepare_connect_req(struct lll_scan *lll, struct pdu_adv *pdu_tx,
 	 * 1.25ms for a legacy PDU, 2.5ms for an LE Uncoded PHY and 3.75ms for
 	 * an LE Coded PHY.
 	 */
-	switch (phy) {
-	case PHY_LEGACY:
-		conn_offset_us += 1250;
-		break;
+	if (0) {
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	case PHY_1M:
-	case PHY_2M:
-		conn_offset_us += 2500;
-		break;
-#if defined(CONFIG_BT_CTLR_PHY_CODED)
-	case PHY_CODED:
-		conn_offset_us += 3750;
-		break;
-#endif /* CONFIG_BT_CTLR_PHY_CODED */
-#endif /* CONFIG_BT_CTLR_ADV_EXT */
-	default:
-		LL_ASSERT(0);
-		break;
+	} else if (phy) {
+		if (phy & PHY_CODED) {
+			conn_offset_us += WIN_DELAY_CODED;
+		} else {
+			conn_offset_us += WIN_DELAY_UNCODED;
+		}
+#endif
+	} else {
+		conn_offset_us += WIN_DELAY_LEGACY;
 	}
 
 	if (!IS_ENABLED(CONFIG_BT_CTLR_SCHED_ADVANCED) ||

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

@@ -354,15 +354,6 @@ static int isr_rx_pdu(struct lll_scan_aux *lll, uint8_t devmatch_ok,
 	struct lll_scan *lll_scan;
 	struct pdu_adv *pdu;
 
-#if defined(CONFIG_BT_CENTRAL)
-	/* AUX_CONNECT_REQ is the same as CONNECT_IND */
-	const uint8_t aux_connect_req_len = sizeof(struct pdu_adv_connect_ind);
-	/* AUX_CONNECT_RSP has only AdvA and TargetA in extended header */
-	const uint8_t aux_connect_rsp_len = PDU_AC_EXT_HEADER_SIZE_MIN +
-					    sizeof(struct pdu_adv_ext_hdr) +
-					    ADVA_SIZE + TARGETA_SIZE;
-#endif
-
 	node_rx = ull_pdu_rx_alloc_peek(3);
 	if (!node_rx) {
 		return -ENOBUFS;
@@ -413,6 +404,17 @@ static int isr_rx_pdu(struct lll_scan_aux *lll, uint8_t devmatch_ok,
 			pdu_end_us %= scan_interval_us;
 		}
 
+		/* AUX_CONNECT_REQ is the same as CONNECT_IND */
+		const uint8_t aux_connect_req_len =
+			sizeof(struct pdu_adv_connect_ind);
+		/* AUX_CONNECT_RSP has only AdvA and TargetA in extended common
+		 * header
+		 */
+		const uint8_t aux_connect_rsp_len =
+			PDU_AC_EXT_HEADER_SIZE_MIN +
+			sizeof(struct pdu_adv_ext_hdr) +
+			ADVA_SIZE + TARGETA_SIZE;
+
 		ull = HDR_LLL2ULL(lll_scan);
 		if (pdu_end_us > (HAL_TICKER_TICKS_TO_US(ull->ticks_slot) -
 				  EVENT_IFS_US -
@@ -460,7 +462,7 @@ static int isr_rx_pdu(struct lll_scan_aux *lll, uint8_t devmatch_ok,
 		radio_tmr_end_capture();
 
 		radio_tmr_tifs_set(EVENT_IFS_US);
-		radio_switch_complete_and_rx(PHY_1M);
+		radio_switch_complete_and_rx(lll->phy);
 		radio_isr_set(isr_tx_connect_req, lll);
 
 #if defined(CONFIG_BT_CTLR_GPIO_PA_PIN)
@@ -678,7 +680,7 @@ static void isr_rx_connect_rsp(void *param)
 	ull_rx_put(rx->hdr.link, rx);
 	ull_rx_sched();
 
-	radio_isr_set(isr_done, lll);
+	radio_isr_set(isr_done, lll_aux);
 	radio_disable();
 }
 #endif /* CONFIG_BT_CENTRAL */

subsys/bluetooth/controller/ll_sw/ull_scan.c

@@ -100,7 +100,11 @@ uint8_t ll_scan_params_set(uint8_t type, uint16_t interval, uint16_t window,
 
 	lll = &scan->lll;
 
+	/* NOTE: Pass invalid interval value to not start scanning using this
+	 *       scan instance.
+	 */
 	if (!interval) {
+		/* Set PHY to 0 to not start scanning on this instance */
 		lll->phy = 0U;
 
 		return 0;

subsys/bluetooth/controller/ll_sw/ull_slave.c

@@ -169,10 +169,14 @@ void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
 	win_offset = sys_le16_to_cpu(pdu_adv->connect_ind.win_offset);
 	conn_interval_us = lll->interval * CONN_INT_UNIT_US;
 
+	/* transmitWindowDelay to default calculated connection offset:
+	 * 1.25ms for a legacy PDU, 2.5ms for an LE Uncoded PHY and 3.75ms for
+	 * an LE Coded PHY.
+	 */
 	if (0) {
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 	} else if (adv->lll.aux) {
-		if (adv->lll.phy_s & BIT(2)) {
+		if (adv->lll.phy_s & PHY_CODED) {
 			win_delay_us = WIN_DELAY_CODED;
 		} else {
 			win_delay_us = WIN_DELAY_UNCODED;