From 8382d6e5be76fbf4aab5054a3e48c86c70bb6e96 Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Tue, 27 Jul 2021 08:47:45 +0200 Subject: [PATCH] Bluetooth: controller: Add CTE Rx params struct to lll_conn declaration Add struct ll_df_conn_rx_params sturcutre to struct lll_conn. This is storage for parametrers required to configure radio for CTE reception in connected mode by lower link layer. Add required includes to make the controller code compilable after change struct ll_conn. Signed-off-by: Piotr Pryga --- subsys/bluetooth/controller/hci/hci_driver.c | 1 + subsys/bluetooth/controller/ll_sw/ll_feat.c | 2 ++ subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c | 2 +- subsys/bluetooth/controller/ll_sw/lll_conn.h | 4 ++++ subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c | 2 ++ subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c | 2 ++ subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c | 1 + subsys/bluetooth/controller/ll_sw/ull_conn.c | 2 +- subsys/bluetooth/controller/ll_sw/ull_filter.c | 2 +- subsys/bluetooth/controller/ll_sw/ull_master.c | 2 +- subsys/bluetooth/controller/ll_sw/ull_scan.c | 1 + subsys/bluetooth/controller/ll_sw/ull_sched.c | 2 +- 12 files changed, 18 insertions(+), 5 deletions(-) diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c index dc6c16a2a53..ae350e42744 100644 --- a/subsys/bluetooth/controller/hci/hci_driver.c +++ b/subsys/bluetooth/controller/hci/hci_driver.c @@ -43,6 +43,7 @@ #include "ll_sw/pdu.h" #include "ll_sw/lll.h" +#include "lll/lll_df_types.h" #include "ll_sw/lll_conn.h" #include "ll.h" diff --git a/subsys/bluetooth/controller/ll_sw/ll_feat.c b/subsys/bluetooth/controller/ll_sw/ll_feat.c index d80fddb93fd..709ac17caea 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_feat.c +++ b/subsys/bluetooth/controller/ll_sw/ll_feat.c @@ -7,6 +7,7 @@ #include +#include "util/util.h" #include "util/memq.h" #include "hal/ccm.h" @@ -14,6 +15,7 @@ #include "pdu.h" #include "lll.h" +#include "lll/lll_df_types.h" #include "lll_conn.h" #include "ull_conn_internal.h" diff --git a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c index bce50e5a1f3..71301a683fd 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c +++ b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c @@ -25,8 +25,8 @@ #include "lll_adv.h" #include "lll/lll_adv_pdu.h" #include "lll_scan.h" -#include "lll_conn.h" #include "lll/lll_df_types.h" +#include "lll_conn.h" #include "ull_adv_types.h" #include "ull_scan_types.h" diff --git a/subsys/bluetooth/controller/ll_sw/lll_conn.h b/subsys/bluetooth/controller/ll_sw/lll_conn.h index 231e02bd43b..01f8e9382f1 100644 --- a/subsys/bluetooth/controller/ll_sw/lll_conn.h +++ b/subsys/bluetooth/controller/ll_sw/lll_conn.h @@ -127,6 +127,10 @@ struct lll_conn { #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL) int8_t tx_pwr_lvl; #endif + +#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_REQ) + struct lll_df_conn_rx_params df_rx_params; +#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_REQ */ }; int lll_conn_init(void); diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c index 5dd7d40cd59..fbab141ba33 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c @@ -17,6 +17,7 @@ #include "hal/ccm.h" #include "hal/radio.h" +#include "util/util.h" #include "util/mem.h" #include "util/memq.h" #include "util/mfifo.h" @@ -25,6 +26,7 @@ #include "lll.h" #include "lll_clock.h" +#include "lll_df_types.h" #include "lll_conn.h" #include "lll_internal.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c index 3bc9dd6ec7a..b10dfe235b9 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c @@ -15,6 +15,7 @@ #include "hal/radio.h" #include "hal/ticker.h" +#include "util/util.h" #include "util/memq.h" #include "pdu.h" @@ -22,6 +23,7 @@ #include "lll.h" #include "lll_vendor.h" #include "lll_clock.h" +#include "lll_df_types.h" #include "lll_conn.h" #include "lll_master.h" #include "lll_chan.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c index 0454faacc6f..9eb4877fe18 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c @@ -30,6 +30,7 @@ #include "lll_vendor.h" #include "lll_clock.h" #include "lll_scan.h" +#include "lll_df_types.h" #include "lll_conn.h" #include "lll_chan.h" #include "lll_filter.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index b5bbe6a0bcc..0cc5da0ce93 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -28,9 +28,9 @@ #include "lll.h" #include "lll_clock.h" +#include "lll/lll_df_types.h" #include "lll_conn.h" #include "lll_conn_iso.h" -#include "lll/lll_df_types.h" #include "ull_conn_types.h" #include "ull_conn_iso_types.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_filter.c b/subsys/bluetooth/controller/ll_sw/ull_filter.c index e9b6f20930a..355b40dd88f 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_filter.c +++ b/subsys/bluetooth/controller/ll_sw/ull_filter.c @@ -26,9 +26,9 @@ #include "lll_adv.h" #include "lll/lll_adv_pdu.h" #include "lll_scan.h" +#include "lll/lll_df_types.h" #include "lll_conn.h" #include "lll_filter.h" -#include "lll/lll_df_types.h" #include "ull_adv_types.h" #include "ull_scan_types.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_master.c b/subsys/bluetooth/controller/ll_sw/ull_master.c index 015867a8f41..b5052a0f57e 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_master.c +++ b/subsys/bluetooth/controller/ll_sw/ull_master.c @@ -31,10 +31,10 @@ #include "lll/lll_adv_pdu.h" #include "lll_chan.h" #include "lll_scan.h" +#include "lll/lll_df_types.h" #include "lll_conn.h" #include "lll_master.h" #include "lll_filter.h" -#include "lll/lll_df_types.h" #include "ull_adv_types.h" #include "ull_scan_types.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan.c b/subsys/bluetooth/controller/ll_sw/ull_scan.c index 1194c1d14f0..85faab116d4 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_scan.c +++ b/subsys/bluetooth/controller/ll_sw/ull_scan.c @@ -29,6 +29,7 @@ #include "lll_adv.h" #include "lll/lll_adv_pdu.h" #include "lll_scan.h" +#include "lll/lll_df_types.h" #include "lll_conn.h" #include "lll_filter.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_sched.c b/subsys/bluetooth/controller/ll_sw/ull_sched.c index 903d718ca3b..21e3bece2d3 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_sched.c +++ b/subsys/bluetooth/controller/ll_sw/ull_sched.c @@ -23,8 +23,8 @@ #include "lll.h" #include "lll/lll_vendor.h" #include "lll_scan.h" -#include "lll_conn.h" #include "lll/lll_df_types.h" +#include "lll_conn.h" #include "ull_scan_types.h" #include "ull_conn_types.h"