Bluetooth: controller: Use set/clear to add/remove ACAD

Use the set/clear function to modify the common extended
header format in the PDU to add/remove ACAD.

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

Author: cvinayak

subsys/bluetooth/controller/ll_sw/ull_adv_aux.c

@@ -93,7 +93,7 @@ uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
 			    uint8_t const *const data)
 {
 	struct ll_adv_set *adv;
-	uint8_t value[5];
+	uint8_t value[1 + sizeof(data)];
 	uint8_t *val_ptr;
 	uint8_t pri_idx;
 	uint8_t err;
@@ -122,7 +122,7 @@ uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
 
 	val_ptr = value;
 	*val_ptr++ = len;
-	sys_put_le32((uint32_t)data, val_ptr);
+	memcpy(val_ptr, &data, sizeof(data));
 	err = ull_adv_aux_hdr_set_clear(adv, ULL_ADV_PDU_HDR_FIELD_AD_DATA,
 					0, value, NULL, &pri_idx);
 	if (err) {

subsys/bluetooth/controller/ll_sw/ull_adv_internal.h

@@ -46,20 +46,24 @@ const uint8_t *ull_adv_pdu_update_addrs(struct ll_adv_set *adv,
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 
+/* Below are BT Spec v5.2, Vol 6, Part B Section 2.3.4 Table 2.12 defined */
 #define ULL_ADV_PDU_HDR_FIELD_ADVA      BIT(0)
 #define ULL_ADV_PDU_HDR_FIELD_TARGETA   BIT(1)
 #define ULL_ADV_PDU_HDR_FIELD_CTE_INFO  BIT(2)
 #define ULL_ADV_PDU_HDR_FIELD_ADI       BIT(3)
 #define ULL_ADV_PDU_HDR_FIELD_AUX_PTR   BIT(4)
 #define ULL_ADV_PDU_HDR_FIELD_SYNC_INFO BIT(5)
-#define ULL_ADV_PDU_HDR_FIELD_TX_POWER  BIT(7)
-#define ULL_ADV_PDU_HDR_FIELD_AD_DATA   BIT(8)
+#define ULL_ADV_PDU_HDR_FIELD_TX_POWER  BIT(6)
+#define ULL_ADV_PDU_HDR_FIELD_RFU       BIT(7)
+/* Below are implementation defined bit fields */
+#define ULL_ADV_PDU_HDR_FIELD_ACAD      BIT(8)
+#define ULL_ADV_PDU_HDR_FIELD_AD_DATA   BIT(9)
 
 /* Helper type to store data for extended advertising
  * header fields and extra data.
  */
-struct adv_pdu_field_data {
-	uint8_t *field_data;
+struct ull_adv_ext_hdr_data {
+	void *field_data;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT_PDU_EXTRA_DATA_MEMORY)
 	void *extra_data;
@@ -116,7 +120,7 @@ void ull_adv_sync_release(struct ll_adv_sync_set *sync);
 uint8_t ull_adv_sync_pdu_alloc(struct ll_adv_set *adv,
 			       uint16_t hdr_add_fields,
 			       uint16_t hdr_rem_fields,
-			       struct adv_pdu_field_data *data,
+			       struct ull_adv_ext_hdr_data *hdr_data,
 			       struct pdu_adv **ter_pdu_prev,
 			       struct pdu_adv **ter_pdu_new,
 			       void **extra_data_prev,
@@ -131,7 +135,7 @@ uint8_t ull_adv_sync_pdu_set_clear(struct lll_adv_sync *lll_sync,
 				   struct pdu_adv *ter_pdu,
 				   uint16_t hdr_add_fields,
 				   uint16_t hdr_rem_fields,
-				   struct adv_pdu_field_data *data);
+				   struct ull_adv_ext_hdr_data *hdr_data);
 
 /* helper function to update extra_data field */
 void ull_adv_sync_extra_data_set_clear(void *extra_data_prev,
@@ -187,10 +191,6 @@ void ull_adv_sync_update(struct ll_adv_sync_set *sync, uint32_t slot_plus_us,
 /* helper function to schedule a mayfly to get sync offset */
 void ull_adv_sync_offset_get(struct ll_adv_set *adv);
 
-/* helper function to reserve ACAD field in PDU buffer */
-uint8_t ull_adv_sync_acad_enable(struct lll_adv_sync *lll_sync,
-				 uint8_t acad_len, void **acad);
-
 int ull_adv_iso_init(void);
 int ull_adv_iso_reset(void);
 

subsys/bluetooth/controller/ll_sw/ull_adv_iso.c

@@ -58,11 +58,16 @@ uint8_t ll_big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bis,
 		      uint8_t packing, uint8_t framing, uint8_t encryption,
 		      uint8_t *bcode)
 {
+	uint8_t field_data[1 + sizeof(uint8_t *)];
+	struct ull_adv_ext_hdr_data hdr_data;
+	void *extra_data_prev, *extra_data;
 	struct lll_adv_sync *lll_adv_sync;
 	struct lll_adv_iso *lll_adv_iso;
+	struct pdu_adv *pdu_prev, *pdu;
 	struct node_rx_pdu *node_rx;
 	struct ll_adv_iso *adv_iso;
 	struct ll_adv_set *adv;
+	uint8_t ter_idx;
 	uint8_t *acad;
 	uint8_t err;
 
@@ -133,16 +138,29 @@ uint8_t ll_big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bis,
 		return BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
 	}
 
+	/* Allocate next PDU */
+	err = ull_adv_sync_pdu_alloc(adv, 0, 0, NULL, &pdu_prev, &pdu,
+				     &extra_data_prev, &extra_data, &ter_idx);
+	if (err) {
+		return err;
+	}
+
 	/* Add ACAD to AUX_SYNC_IND */
-	err = ull_adv_sync_acad_enable(lll_adv_sync,
-				       (sizeof(struct pdu_big_info) + 2),
-				       (void **)&acad);
+	hdr_data.field_data = field_data;
+	field_data[0] = sizeof(struct pdu_big_info) + 2;
+	err = ull_adv_sync_pdu_set_clear(lll_adv_sync, pdu_prev, pdu,
+					 ULL_ADV_PDU_HDR_FIELD_ACAD, 0U,
+					 &hdr_data);
 	if (err) {
 		return err;
 	}
+
+	memcpy(&acad, &field_data[1], sizeof(acad));
 	acad[0] = sizeof(struct pdu_big_info) + 1;
 	acad[1] = BT_DATA_BIG_INFO;
 
+	lll_adv_sync_data_enqueue(lll_adv_sync, ter_idx);
+
 	/* TODO: For now we can just use the unique BIG handle as the BIS
 	 * handle until we support multiple BIS
 	 */
@@ -209,11 +227,15 @@ uint8_t ll_big_test_create(uint8_t big_handle, uint8_t adv_handle,
 
 uint8_t ll_big_terminate(uint8_t big_handle, uint8_t reason)
 {
+	void *extra_data_prev, *extra_data;
 	struct lll_adv_sync *lll_adv_sync;
 	struct lll_adv_iso *lll_adv_iso;
+	struct pdu_adv *pdu_prev, *pdu;
 	struct node_rx_pdu *node_rx;
 	struct ll_adv_iso *adv_iso;
 	struct lll_adv *lll_adv;
+	struct ll_adv_set *adv;
+	uint8_t ter_idx;
 	uint32_t ret;
 	uint8_t err;
 
@@ -229,13 +251,24 @@ uint8_t ll_big_terminate(uint8_t big_handle, uint8_t reason)
 	}
 
 	lll_adv_sync = lll_adv->sync;
+	adv = HDR_LLL2ULL(lll_adv);
+
+	/* Allocate next PDU */
+	err = ull_adv_sync_pdu_alloc(adv, 0, 0, NULL, &pdu_prev, &pdu,
+				     &extra_data_prev, &extra_data, &ter_idx);
+	if (err) {
+		return err;
+	}
 
 	/* Remove ACAD to AUX_SYNC_IND */
-	err = ull_adv_sync_acad_enable(lll_adv_sync, 0, NULL);
+	err = ull_adv_sync_pdu_set_clear(lll_adv_sync, pdu_prev, pdu,
+					 0U, ULL_ADV_PDU_HDR_FIELD_ACAD, NULL);
 	if (err) {
 		return err;
 	}
 
+	lll_adv_sync_data_enqueue(lll_adv_sync, ter_idx);
+
 	/* TODO: Terminate all BIS data paths */
 
 	ret = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,