michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: controller: Fix for uninitialized data compile error

Browse source 
Due to conditional compile path ending in LL_ASSERT(0), the compiler
sees code following the assert as using uninitialized variables.

Signed-off-by: Morten Priess <mtpr@oticon.com>
This commit is contained in:
Morten Priess 2019-08-16 15:46:14 +02:00 • committed by Alberto Escolar
commit 69ff0f310e
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c
View file

@ -120,6 +120,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
&lll->data_chan_map[0], &lll->data_chan_map[0],
lll->data_chan_count); lll->data_chan_count);
#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ #else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
data_chan_use = 0;
LL_ASSERT(0); LL_ASSERT(0);
#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ #endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
} else { } else {

1
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c
View file

@ -131,6 +131,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
&lll->data_chan_map[0], &lll->data_chan_map[0],
lll->data_chan_count); lll->data_chan_count);
#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ #else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
data_chan_use = 0;
LL_ASSERT(0); LL_ASSERT(0);
#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ #endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
} else { } else {