michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix missing re-initialization of ret_cb

Browse source 
Fix missing re-initialization of ret_cb to
TICKER_STATUS_BUSY before every new call to ticker interface
functions' with operation's callback.

One issue was undirected advertisement disable to return
failure status in the scan_adv sample.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2017-06-30 11:29:30 +02:00 • committed by Johan Hedberg
commit 4362eda4aa
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -8147,6 +8147,7 @@ static u32_t role_disable(u8_t ticker_id_primary, u8_t ticker_id_stop)
_radio.ticker_id_stop = ticker_id_primary; _radio.ticker_id_stop = ticker_id_primary;
/* Step 1: Is Primary started? Stop the Primary ticker */ /* Step 1: Is Primary started? Stop the Primary ticker */
ret_cb = TICKER_STATUS_BUSY;
ret = ticker_stop(RADIO_TICKER_INSTANCE_ID_RADIO, ret = ticker_stop(RADIO_TICKER_INSTANCE_ID_RADIO,
RADIO_TICKER_USER_ID_APP, ticker_id_primary, RADIO_TICKER_USER_ID_APP, ticker_id_primary,
ticker_if_done, (void *)&ret_cb); ticker_if_done, (void *)&ret_cb);
@ -8357,6 +8358,7 @@ u32_t radio_adv_enable(u16_t interval, u8_t chl_map, u8_t filter_policy)
goto failure_cleanup; goto failure_cleanup;
} }
ret_cb = TICKER_STATUS_BUSY;
ret = ret =
ticker_start(RADIO_TICKER_INSTANCE_ID_RADIO, ticker_start(RADIO_TICKER_INSTANCE_ID_RADIO,
RADIO_TICKER_USER_ID_APP, RADIO_TICKER_USER_ID_APP,