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

rename callbackTime to newCallbackTime

pull/932/head
Rohit Grover 2015-02-25 12:16:11 +00:00 committed by Rohit Grover
parent 90354c0a23
commit 2e892c6c0d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,19 +187,19 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
us_ticker_init(); us_ticker_init();
} }
uint32_t callbackTime = MICROSECONDS_TO_RTC_UNITS(timestamp); uint32_t newCallbackTime = MICROSECONDS_TO_RTC_UNITS(timestamp);
if (callbackTime == rtc1_getCounter()) { if (newCallbackTime == rtc1_getCounter()) {
us_ticker_callbackPending = false; us_ticker_callbackPending = false;
rtc1_disableCompareInterrupt(); rtc1_disableCompareInterrupt();
us_ticker_irq_handler(); us_ticker_irq_handler();
return; return;
} }
if (us_ticker_callbackPending && (callbackTime == us_ticker_callbackTimestamp)) { if (us_ticker_callbackPending && (newCallbackTime == us_ticker_callbackTimestamp)) {
return; return;
} }
NRF_RTC1->CC[0] = callbackTime & MAX_RTC_COUNTER_VAL; NRF_RTC1->CC[0] = newCallbackTime & MAX_RTC_COUNTER_VAL;
us_ticker_callbackTimestamp = callbackTime; us_ticker_callbackTimestamp = newCallbackTime;
if (!us_ticker_callbackPending) { if (!us_ticker_callbackPending) {
us_ticker_callbackPending = true; us_ticker_callbackPending = true;
rtc1_enableCompareInterrupt(); rtc1_enableCompareInterrupt();