michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Tests: bluetooth: fix ctrl_user_ext test

Browse source 
The tests/bluetooth/ctrl_user_ext test fails due to
compilation errors, which are fixed with this PR

Signed-off-by: Andries Kruithof <andries.kruithof@nordicsemi.no>
This commit is contained in:
Andries Kruithof 2022-05-12 04:48:32 -07:00 • committed by Maureen Helm
commit d201055e70
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/bluetooth/controller/ll_sw/ull.c
View file

@ -55,6 +55,10 @@
#include "ull_df_types.h"
#include "ull_df_internal.h"
#if defined(CONFIG_BT_CTLR_USER_EXT)
#include "ull_vendor.h"
#endif /* CONFIG_BT_CTLR_USER_EXT */
#include "isoal.h"
#include "ull_internal.h"
#include "ull_iso_internal.h"
@ -72,10 +76,6 @@
#include "ull_conn_iso_internal.h"
#include "ull_peripheral_iso_internal.h"
#if defined(CONFIG_BT_CTLR_USER_EXT)
#include "ull_vendor.h"
#endif /* CONFIG_BT_CTLR_USER_EXT */
#include "ll.h"
#include "ll_feat.h"
#include "ll_test.h"

8
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -41,6 +41,11 @@
#include "ull_iso_types.h"
#include "ull_conn_types.h"
#include "ull_conn_iso_types.h"
#if defined(CONFIG_BT_CTLR_USER_EXT)
#include "ull_vendor.h"
#endif /* CONFIG_BT_CTLR_USER_EXT */
#include "ull_internal.h"
#include "ull_sched_internal.h"
#include "ull_chan_internal.h"
@ -52,9 +57,6 @@
#include "ull_conn_iso_internal.h"
#include "ull_peripheral_iso_internal.h"
#if defined(CONFIG_BT_CTLR_USER_EXT)
#include "ull_vendor.h"
#endif /* CONFIG_BT_CTLR_USER_EXT */
#include "ll.h"
#include "ll_feat.h"

1
subsys/bluetooth/controller/ll_sw/ull_internal.h
View file

@ -12,7 +12,6 @@
#define CONN_INTERVAL_MIN(x) (6)
#else /* CONFIG_BT_CTLR_USER_CPR_INTERVAL_MIN */
/* Proprietary user defined CPR Interval Minimum */
extern uint16_t ull_conn_interval_min_get(struct ll_conn *conn);
#define CONN_INTERVAL_MIN(x) (MAX(ull_conn_interval_min_get(x), 1))
#endif /* CONFIG_BT_CTLR_USER_CPR_INTERVAL_MIN */

1
subsys/bluetooth/controller/ll_sw/ull_scan.c
View file

@ -37,6 +37,7 @@
#include "ull_adv_types.h"
#include "ull_filter.h"
#include "ull_conn_types.h"
#include "ull_internal.h"
#include "ull_adv_internal.h"
#include "ull_scan_types.h"