Bluetooth: Controller: Make PDU octet3 vendor specific

Make Data, ISO, BIS and CIS PDU structure's octet 3 vendor
specific.

This will allow vendors not supporting the octet 3 or
CTEInfo (8 bits) to save 1 octet in their PDU structures.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>

subsys/bluetooth/controller/CMakeLists.txt

@@ -171,7 +171,6 @@ zephyr_library_sources_ifdef(
 zephyr_library_include_directories(
   .
   include
-  ll_sw
   )
 
 zephyr_library_compile_options_ifdef(

subsys/bluetooth/controller/crypto/crypto.c

@@ -9,7 +9,7 @@
 #include "util/memq.h"
 
 #include "hal/ecb.h"
-#include "lll.h"
+#include "ll_sw/lll.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
 #include <zephyr/logging/log.h>

subsys/bluetooth/controller/hci/hci.c

@@ -35,6 +35,8 @@
 
 #include "ticker/ticker.h"
 
+#include "ll_sw/pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "ll_sw/pdu.h"
 
 #include "ll_sw/lll.h"
@@ -52,7 +54,7 @@
 #include "ll_sw/isoal.h"
 
 #if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
-#include "ull_tx_queue.h"
+#include "ll_sw/ull_tx_queue.h"
 #endif
 
 #include "ll_sw/ull_adv_types.h"

subsys/bluetooth/controller/hci/hci_driver.c

@@ -40,7 +40,10 @@
 #include "hal/radio.h"
 #endif /* CONFIG_SOC_FAMILY_NRF */
 
+#include "ll_sw/pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "ll_sw/pdu.h"
+
 #include "ll_sw/lll.h"
 #include "lll/lll_df_types.h"
 #include "ll_sw/lll_sync_iso.h"

subsys/bluetooth/controller/ll_sw/isoal.c

@@ -20,9 +20,10 @@
 
 #include "hal/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
-
 #include "ll.h"
 #include "lll.h"
 #include "lll_conn_iso.h"

subsys/bluetooth/controller/ll_sw/ll_addr.c

@@ -16,6 +16,8 @@
 #include "util/memq.h"
 #include "util/mem.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ll_feat.c

@@ -13,6 +13,8 @@
 
 #include "hal/ccm.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c

@@ -19,6 +19,8 @@
 #include "util/mem.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c

@@ -21,6 +21,8 @@
 #include "hal/radio.h"
 #include "hal/ticker.h"
 
+#include "ll_sw/pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "ll_sw/pdu.h"
 
 #include "radio_internal.h"

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c

@@ -13,7 +13,9 @@
 #include <hal/nrf_gpio.h>
 #include <hal/ccm.h>
 
-#include "ll_sw/pdu.h"
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
+#include "pdu.h"
 
 #include "radio_nrf5.h"
 #include "radio.h"

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

@@ -26,6 +26,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -19,6 +19,8 @@
 #include "util/mem.h"
 #include "util/memq.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"
@@ -155,10 +157,12 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 #if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX)
 	if (pdu_data_tx->cp) {
-		cte_len = CTE_LEN_US(pdu_data_tx->cte_info.time);
+		cte_len = CTE_LEN_US(pdu_data_tx->octet3.cte_info.time);
 
-		lll_df_cte_tx_configure(pdu_data_tx->cte_info.type, pdu_data_tx->cte_info.time,
+		lll_df_cte_tx_configure(pdu_data_tx->octet3.cte_info.type,
-					lll->df_tx_cfg.ant_sw_len, lll->df_tx_cfg.ant_ids);
+					pdu_data_tx->octet3.cte_info.time,
+					lll->df_tx_cfg.ant_sw_len,
+					lll->df_tx_cfg.ant_ids);
 	} else
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX */
 	{

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

@@ -15,6 +15,8 @@
 #include "util/memq.h"
 #include "util/mfifo.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -24,6 +24,8 @@
 #include "util/mfifo.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"
@@ -295,9 +297,9 @@ void lll_conn_isr_rx(void *param)
 			pdu_scratch = (struct pdu_data *)radio_pkt_scratch_get();
 
 			if (pdu_scratch->cp) {
-				(void)memcpy((void *)&pdu_data_rx->cte_info,
+				(void)memcpy((void *)&pdu_data_rx->octet3.cte_info,
-					     (void *)&pdu_scratch->cte_info,
+					     (void *)&pdu_scratch->octet3.cte_info,
-					     sizeof(pdu_data_rx->cte_info));
+					     sizeof(pdu_data_rx->octet3.cte_info));
 			}
 		}
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX && defined(CONFIG_BT_CTLR_LE_ENC) */
@@ -308,10 +310,12 @@ void lll_conn_isr_rx(void *param)
 
 #if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX)
 	if (pdu_data_tx->cp) {
-		cte_len = CTE_LEN_US(pdu_data_tx->cte_info.time);
+		cte_len = CTE_LEN_US(pdu_data_tx->octet3.cte_info.time);
 
-		lll_df_cte_tx_configure(pdu_data_tx->cte_info.type, pdu_data_tx->cte_info.time,
+		lll_df_cte_tx_configure(pdu_data_tx->octet3.cte_info.type,
-					lll->df_tx_cfg.ant_sw_len, lll->df_tx_cfg.ant_ids);
+					pdu_data_tx->octet3.cte_info.time,
+					lll->df_tx_cfg.ant_sw_len,
+					lll->df_tx_cfg.ant_ids);
 	} else
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX */
 	{
@@ -576,7 +580,7 @@ void lll_conn_isr_tx(void *param)
 	LL_ASSERT(pdu_tx);
 
 	if (pdu_tx->cp) {
-		cte_len = CTE_LEN_US(pdu_tx->cte_info.time);
+		cte_len = CTE_LEN_US(pdu_tx->octet3.cte_info.time);
 	} else {
 		cte_len = 0U;
 	}
@@ -789,7 +793,7 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx)
 			 * with CONTINUE PDUs if fragmentation is performed.
 			 */
 			p->cp = 0U;
-			p->resv = 0U;
+			p->octet3.resv[0] = 0U;
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX || CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 		}
 
@@ -813,7 +817,10 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx)
 
 #if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
 #if !defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) && !defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
-		p->resv = 0U;
+		/* Initialize only if vendor PDU octet3 present */
+		if (sizeof(p->octet3.resv)) {
+			p->octet3.resv[0] = 0U;
+		}
 #endif /* !CONFIG_BT_CTLR_DF_CONN_CTE_TX && !CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
 	}

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

@@ -13,7 +13,10 @@
 #include "util/memq.h"
 #include "util/mem.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
+
 #include "lll.h"
 #include "lll_conn_iso.h"
 

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

@@ -17,6 +17,8 @@
 #include "hal/ccm.h"
 #include "hal/radio_df.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -20,6 +20,8 @@
 #include "util/dbuf.h"
 #include "util/util.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -13,7 +13,10 @@
 #include "util/memq.h"
 #include "util/mfifo.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
+
 #include "lll.h"
 #include "lll_conn_iso.h"
 #include "lll_peripheral_iso.h"

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

@@ -15,6 +15,8 @@
 
 #include "util/memq.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -25,6 +25,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -21,6 +21,8 @@
 #include "util/dbuf.h"
 #include "util/mayfly.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -18,6 +18,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -18,6 +18,8 @@
 #include "util/util.h"
 #include "util/memq.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -21,6 +21,8 @@
 #include "util/util.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"
@@ -545,8 +547,8 @@ static void payload_set(uint8_t type, uint8_t len, uint8_t cte_len, uint8_t cte_
 
 #if defined(CONFIG_BT_CTLR_DF_CTE_TX)
 	pdu->cp = cte_len ? 1U : 0U;
-	pdu->cte_info.time = cte_len;
+	pdu->octet3.cte_info.time = cte_len;
-	pdu->cte_info.type = cte_type;
+	pdu->octet3.cte_info.type = cte_type;
 #else
 	ARG_UNUSED(cte_len);
 	ARG_UNUSED(cte_type);

subsys/bluetooth/controller/ll_sw/nordic/lll/pdu_vendor.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
+#define OCTET3_LEN 0U
+#else /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
+#define OCTET3_LEN 1U
+#endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
+
+/* Presence of vendor Data PDU struct octet3 */
+struct pdu_data_vnd_octet3 {
+	union {
+		uint8_t resv[OCTET3_LEN]; /* nRF specific octet3 required for NRF_CCM use */
+
+#if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
+		struct pdu_cte_info cte_info; /* BT 5.1 Core spec. CTEInfo storage */
+#endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
+	} __packed;
+} __packed;
+
+/* Presence of vendor BIS PDU struct octet3 */
+struct pdu_bis_vnd_octet3 {
+	union {
+		uint8_t resv[OCTET3_LEN]; /* nRF specific octet3 required for NRF_CCM use */
+	} __packed;
+} __packed;
+
+/* Presence of vendor CIS PDU struct octet3 */
+struct pdu_cis_vnd_octet3 {
+	union {
+		uint8_t resv[OCTET3_LEN]; /* nRF specific octet3 required for NRF_CCM use */
+	} __packed;
+} __packed;
+
+/* Presence of ISOAL helper vendor ISO PDU struct octet3 */
+struct pdu_iso_vnd_octet3 {
+	union {
+		uint8_t resv[OCTET3_LEN]; /* nRF specific octet3 required for NRF_CCM use */
+	} __packed;
+} __packed;

subsys/bluetooth/controller/ll_sw/nrf.cmake

@@ -101,6 +101,7 @@ zephyr_library_sources_ifdef(
   )
 
 zephyr_library_include_directories(
+  ll_sw
   ll_sw/nordic
   hci/nordic
 )

subsys/bluetooth/controller/ll_sw/openisa.cmake

@@ -47,6 +47,7 @@ zephyr_library_sources_ifdef(
 
 if(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
   zephyr_library_include_directories(
+    ll_sw
     ll_sw/openisa
     hci/openisa
     )

subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c

@@ -16,8 +16,11 @@
 #include <errno.h>
 
 #include "util/mem.h"
+
 #include "hal/ccm.h"
 #include "hal/radio.h"
+
+#include "lll/pdu_vendor.h"
 #include "ll_sw/pdu.h"
 
 #include "fsl_xcvr.h"

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

@@ -24,6 +24,7 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_central.c

@@ -17,6 +17,7 @@
 #include "util/util.h"
 #include "util/memq.h"
 
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c

@@ -21,6 +21,7 @@
 #include "util/memq.h"
 #include "util/mfifo.h"
 
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_peripheral.c

@@ -17,6 +17,7 @@
 #include "util/util.h"
 #include "util/memq.h"
 
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c

@@ -12,6 +12,7 @@
 
 #include "util/memq.h"
 
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

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

@@ -20,6 +20,7 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/openisa/lll/pdu_vendor.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* No vendor Data PDU struct octet3 */
+struct pdu_data_vnd_octet3 {
+	union {
+		uint8_t resv[0];
+	} __packed;
+} __packed;
+
+/* No vendor BIS PDU struct octet3 */
+struct pdu_bis_vnd_octet3 {
+	union {
+		uint8_t resv[0];
+	} __packed;
+} __packed;
+
+/* No vendor CIS PDU struct octet3 */
+struct pdu_cis_vnd_octet3 {
+	union {
+		uint8_t resv[0];
+	} __packed;
+} __packed;
+
+/* No ISOAL helper vendor ISO PDU struct octet3 */
+struct pdu_iso_vnd_octet3 {
+	union {
+		uint8_t resv[0];
+	} __packed;
+} __packed;

subsys/bluetooth/controller/ll_sw/pdu.h

@@ -472,18 +472,6 @@ enum pdu_adv_aux_phy {
 	EXT_ADV_AUX_PHY_LE_CODED = 0x02,
 };
 
-struct pdu_cte_info {
-#ifdef CONFIG_LITTLE_ENDIAN
-	uint8_t  time:5;
-	uint8_t  rfu:1;
-	uint8_t  type:2;
-#else
-	uint8_t  type:2;
-	uint8_t  rfu:1;
-	uint8_t  time:5;
-#endif /* CONFIG_LITTLE_ENDIAN */
-} __packed;
-
 struct pdu_adv_sync_info {
 #ifdef CONFIG_LITTLE_ENDIAN
 	uint16_t offs:13;
@@ -958,14 +946,7 @@ struct pdu_data {
 
 	uint8_t len;
 
-#if !defined(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
+	struct pdu_data_vnd_octet3 octet3;
-#if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
-	union {
-		uint8_t resv; /* TODO: remove nRF specific code */
-		struct pdu_cte_info cte_info; /* BT 5.1 Core spec. CTEInfo storage */
-	};
-#endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
-#endif /* !CONFIG_SOC_OPENISA_RV32M1_RISCV32 */
 
 	union {
 		struct pdu_data_llctrl llctrl;
@@ -995,6 +976,8 @@ struct pdu_iso {
 
 	uint8_t len;
 
+	struct pdu_iso_vnd_octet3 octet3;
+
 	uint8_t payload[0];
 } __packed;
 
@@ -1055,6 +1038,8 @@ struct pdu_cis {
 
 	uint8_t len;
 
+	struct pdu_cis_vnd_octet3 octet3;
+
 	uint8_t payload[0];
 } __packed;
 
@@ -1109,6 +1094,8 @@ struct pdu_bis {
 
 	uint8_t len;
 
+	struct pdu_bis_vnd_octet3 octet3;
+
 	union {
 		uint8_t payload[0];
 		struct pdu_big_ctrl ctrl;
@@ -1196,12 +1183,8 @@ struct pdu_dtm {
 
 	uint8_t len;
 
-#if defined(CONFIG_BT_CTLR_DF_CTE_TX)
+	struct pdu_data_vnd_octet3 octet3;
-	union {
+
-		uint8_t resv; /* TODO: remove nRF specific code */
-		struct pdu_cte_info cte_info; /* BT 5.1 Core spec. CTEInfo storage */
-	};
-#endif
 	uint8_t payload[0];
 } __packed;
 

subsys/bluetooth/controller/ll_sw/pdu_df.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+struct pdu_cte_info {
+#ifdef CONFIG_LITTLE_ENDIAN
+	uint8_t  time:5;
+	uint8_t  rfu:1;
+	uint8_t  type:2;
+#else
+	uint8_t  type:2;
+	uint8_t  rfu:1;
+	uint8_t  time:5;
+#endif /* CONFIG_LITTLE_ENDIAN */
+} __packed;

subsys/bluetooth/controller/ll_sw/ull.c

@@ -28,6 +28,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_adv.c

@@ -26,6 +26,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_adv_aux.c

@@ -21,6 +21,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_adv_iso.c

@@ -21,6 +21,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_adv_sync.c

@@ -21,6 +21,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_central.c

@@ -22,6 +22,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_central_iso.c

@@ -18,6 +18,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_chan.c

@@ -18,6 +18,8 @@
 
 #include "hal/ccm.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_conn.c

@@ -25,6 +25,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"
@@ -54,7 +56,7 @@
 #include "ull_sched_internal.h"
 #include "ull_chan_internal.h"
 #include "ull_conn_internal.h"
-#include "ull_periph_internal.h"
+#include "ull_peripheral_internal.h"
 #include "ull_central_internal.h"
 
 #include "ull_iso_internal.h"
@@ -2341,7 +2343,7 @@ void ull_pdu_data_init(struct pdu_data *pdu)
 {
 #if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) || defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
 	pdu->cp = 0U;
-	pdu->resv = 0U;
+	pdu->octet3.resv[0] = 0U;
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX || CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 }
 

subsys/bluetooth/controller/ll_sw/ull_conn_iso.c

@@ -15,6 +15,8 @@
 #include "hal/ccm.h"
 #include "hal/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "lll.h"
 #include "lll_conn.h"

subsys/bluetooth/controller/ll_sw/ull_df.c

@@ -19,6 +19,8 @@
 #include "util/mfifo.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_filter.c

@@ -20,6 +20,8 @@
 #include "util/mayfly.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_iso.c

@@ -10,6 +10,7 @@
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
+#include "hal/ticker.h"
 
 #include "util/util.h"
 #include "util/mem.h"
@@ -18,8 +19,9 @@
 #include "util/mayfly.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
-#include "hal/ticker.h"
 
 #include "lll.h"
 #include "lll/lll_adv_types.h"

subsys/bluetooth/controller/ll_sw/ull_llcp.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_feat.h"
 #include "ll_settings.h"
@@ -43,7 +46,7 @@
 #include "ull_llcp.h"
 #include "ull_llcp_features.h"
 #include "ull_llcp_internal.h"
-#include "ull_periph_internal.h"
+#include "ull_peripheral_internal.h"
 
 #include <soc.h>
 #include "hal/debug.h"

subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c

@@ -19,7 +19,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_feat.h"
 #include "ll_settings.h"

subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_settings.h"
 

subsys/bluetooth/controller/ll_sw/ull_llcp_common.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_settings.h"
 

subsys/bluetooth/controller/ll_sw/ull_llcp_conn_upd.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_feat.h"
 #include "ll_settings.h"

subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c

@@ -19,7 +19,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_feat.h"
 #include "ll_settings.h"

subsys/bluetooth/controller/ll_sw/ull_llcp_local.c

@@ -19,7 +19,10 @@
 #include "util/mayfly.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_settings.h"
 

subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_settings.h"
 
@@ -726,7 +729,7 @@ void llcp_pdu_encode_cte_req(struct proc_ctx *ctx, struct pdu_data *pdu)
 
 void llcp_pdu_decode_cte_rsp(struct proc_ctx *ctx, const struct pdu_data *pdu)
 {
-	if (pdu->cp == 0U || pdu->cte_info.time == 0U) {
+	if (pdu->cp == 0U || pdu->octet3.cte_info.time == 0U) {
 		ctx->data.cte_remote_rsp.has_cte = false;
 	} else {
 		ctx->data.cte_remote_rsp.has_cte = true;
@@ -761,8 +764,8 @@ void llcp_pdu_encode_cte_rsp(const struct proc_ctx *ctx, struct pdu_data *pdu)
 	pdu->cp = 1U;
 	pdu->rfu = 0U;
 
-	pdu->cte_info.time = ctx->data.cte_remote_req.min_cte_len;
+	pdu->octet3.cte_info.time = ctx->data.cte_remote_req.min_cte_len;
-	pdu->cte_info.type = ctx->data.cte_remote_req.cte_type;
+	pdu->octet3.cte_info.type = ctx->data.cte_remote_req.cte_type;
 }
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RSP */
 

subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_settings.h"
 

subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c

@@ -18,7 +18,10 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
+
 #include "ll.h"
 #include "ll_settings.h"
 #include "ll_feat.h"

subsys/bluetooth/controller/ll_sw/ull_peripheral.c

@@ -22,6 +22,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"
@@ -48,7 +50,7 @@
 #include "ull_internal.h"
 #include "ull_adv_internal.h"
 #include "ull_conn_internal.h"
-#include "ull_periph_internal.h"
+#include "ull_peripheral_internal.h"
 
 #include "ll.h"
 

subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c

@@ -16,6 +16,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_scan.c

@@ -22,6 +22,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_scan_aux.c

@@ -18,6 +18,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_sched.c

@@ -19,6 +19,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_sync.c

@@ -22,6 +22,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/ll_sw/ull_sync_iso.c

@@ -20,6 +20,8 @@
 
 #include "ticker/ticker.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

subsys/bluetooth/controller/util/util.c

@@ -13,9 +13,12 @@
 
 #include "util.h"
 #include "util/memq.h"
-#include "lll.h"
 
-#include "pdu.h"
+#include "ll_sw/lll.h"
+
+#include "ll_sw/pdu_df.h"
+#include "lll/pdu_vendor.h"
+#include "ll_sw/pdu.h"
 
 /**
  * @brief Population count: Count the number of bits set to 1

tests/bluetooth/controller/common/src/helper_pdu.c

@@ -20,6 +20,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/common/src/helper_util.c

@@ -20,6 +20,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_api/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_chmu/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_cis_create/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_cis_terminate/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_collision/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_conn_update/src/main.c

@@ -20,6 +20,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_cte_req/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_data_length_update/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_feat.h"

tests/bluetooth/controller/ctrl_encrypt/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_feat.h"

tests/bluetooth/controller/ctrl_feature_exchange/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_hci/src/main.c

@@ -22,6 +22,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_invalid/src/main.c

@@ -18,6 +18,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_le_ping/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_min_used_chans/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_phy_update/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_sca_update/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_feat.h"

tests/bluetooth/controller/ctrl_terminate/src/main.c

@@ -20,6 +20,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c

@@ -21,6 +21,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_tx_queue/src/main.c

@@ -15,6 +15,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "lll.h"
 

tests/bluetooth/controller/ctrl_unsupported/src/main.c

@@ -18,6 +18,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/ctrl_version/src/main.c

@@ -19,6 +19,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/mock_ctrl/src/ll.c

@@ -20,6 +20,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/mock_ctrl/src/lll.c

@@ -20,6 +20,8 @@
 #include "util/memq.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_settings.h"

tests/bluetooth/controller/mock_ctrl/src/lll_conn.c

@@ -22,6 +22,8 @@
 #include "util/mfifo.h"
 #include "util/dbuf.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 
 #include "lll.h"

tests/bluetooth/controller/mock_ctrl/src/ull.c

@@ -18,6 +18,8 @@
 #include "util/dbuf.h"
 #include "util.h"
 
+#include "pdu_df.h"
+#include "lll/pdu_vendor.h"
 #include "pdu.h"
 #include "ll.h"
 #include "ll_feat.h"