espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-11 19:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/ll: Do not access OS structs internals

Browse Source 
We should not access os_cputime internals directly as on some platform
hal_timer may be used in some tricky way so it may fail. Instead, let's
use helper variables instead.
This commit is contained in:
Andrzej Kaczmarek
2019-11-20 11:49:49 +01:00
parent 18917df5ea
commit c47e210307
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll.h
+2
View File
@@ -118,8 +118,10 @@ struct ble_ll_obj
#ifdef BLE_XCVR_RFCLK
uint8_t ll_rfclk_state;
uint8_t ll_rfclk_is_sched;
uint16_t ll_xtal_ticks;
uint32_t ll_rfclk_start_time;
uint32_t ll_rfclk_sched_time;
struct hal_timer ll_rfclk_timer;
#endif
nimble/controller/src/ble_ll_xcvr.c
+11 -2
View File
@@ -67,6 +67,8 @@ ble_ll_xcvr_rfclk_disable(void)
void
ble_ll_xcvr_rfclk_stop(void)
{
OS_ASSERT_CRITICAL();
g_ble_ll_data.ll_rfclk_is_sched = 0;
os_cputime_timer_stop(&g_ble_ll_data.ll_rfclk_timer);
ble_ll_xcvr_rfclk_disable();
}
@@ -101,6 +103,8 @@ ble_ll_xcvr_rfclk_time_till_settled(void)
void
ble_ll_xcvr_rfclk_timer_exp(void *arg)
{
g_ble_ll_data.ll_rfclk_is_sched = 0;
if (g_ble_ll_data.ll_rfclk_state == BLE_RFCLK_STATE_OFF) {
ble_ll_xcvr_rfclk_start_now(os_cputime_get32());
}
@@ -130,6 +134,8 @@ ble_ll_xcvr_rfclk_start_now(uint32_t now)
void
ble_ll_xcvr_rfclk_timer_start(uint32_t cputime)
{
OS_ASSERT_CRITICAL();
/*
* If we are currently in an advertising event or a connection event,
* no need to start the cputime timer
@@ -147,12 +153,15 @@ ble_ll_xcvr_rfclk_timer_start(uint32_t cputime)
* 'cputime'. If the expiry is before, no need to do anything. If it
* is after, we need to stop the timer and start at new time.
*/
if (g_ble_ll_data.ll_rfclk_timer.link.tqe_prev != NULL) {
if ((int32_t)(cputime - g_ble_ll_data.ll_rfclk_timer.expiry) >= 0) {
if (g_ble_ll_data.ll_rfclk_is_sched) {
if ((int32_t)(cputime - g_ble_ll_data.ll_rfclk_sched_time) >= 0) {
return;
}
os_cputime_timer_stop(&g_ble_ll_data.ll_rfclk_timer);
}
g_ble_ll_data.ll_rfclk_is_sched = 1;
g_ble_ll_data.ll_rfclk_sched_time = cputime;
os_cputime_timer_start(&g_ble_ll_data.ll_rfclk_timer, cputime);
}
#endif