ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify the algorithm which keeps only one app_timer timer running.

pull/467/merge
Rohit Grover 2014-08-20 13:40:08 +01:00
parent dcdca19948
commit c8fc050ce4
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c
View File

@ -20,8 +20,9 @@
#include "app_timer.h" #include "app_timer.h"
#include "projectconfig.h" #include "projectconfig.h"
static bool us_ticker_inited = false; static bool us_ticker_inited = false;
static app_timer_id_t us_ticker_appTimerID = TIMER_NULL; static volatile bool us_ticker_appTimerRunning = false;
static app_timer_id_t us_ticker_appTimerID = TIMER_NULL;
void us_ticker_init(void) void us_ticker_init(void)
{ {
@ -52,13 +53,12 @@ uint32_t us_ticker_read()
* Needed because the irq_handler() doesn't take any parameter.*/ * Needed because the irq_handler() doesn't take any parameter.*/
static void us_ticker_app_timer_callback(void *context) static void us_ticker_app_timer_callback(void *context)
{ {
us_ticker_appTimerRunning = false;
us_ticker_irq_handler(); us_ticker_irq_handler();
} }
void us_ticker_set_interrupt(timestamp_t timestamp) void us_ticker_set_interrupt(timestamp_t timestamp)
{ {
static unsigned cachedInterruptTimestamp;
if (!us_ticker_inited) { if (!us_ticker_inited) {
us_ticker_init(); us_ticker_init();
} }
@ -68,14 +68,11 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
/* placeholder to do something to recover from error */ /* placeholder to do something to recover from error */
return; return;
} }
} else {
/* we want to avoid taking action on duplicate requests */
if (timestamp == cachedInterruptTimestamp) {
return;
}
} }
cachedInterruptTimestamp = timestamp;
if (us_ticker_appTimerRunning) {
return;
}
timestamp_t currentCounter64; timestamp_t currentCounter64;
app_timer_cnt_get(&currentCounter64); app_timer_cnt_get(&currentCounter64);
@ -90,6 +87,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
/* placeholder to do something to recover from error */ /* placeholder to do something to recover from error */
return; return;
} }
us_ticker_appTimerRunning = true;
} }
} }