riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1883 from kaspar030/hwtimer_new_irq_api

Browse Source 
core: hwtimer: use disable/restoreIRQ
This commit is contained in:
benpicco 2014-10-28 15:53:50 +01:00
commit 37d8cabbe8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/hwtimer.c
View File

@ -148,15 +148,17 @@ static int _hwtimer_set(unsigned long offset, void (*callback)(void*), void *ptr
{ {
DEBUG("_hwtimer_set: offset=%lu callback=%p ptr=%p absolute=%d\n", offset, callback, ptr, absolute); DEBUG("_hwtimer_set: offset=%lu callback=%p ptr=%p absolute=%d\n", offset, callback, ptr, absolute);
unsigned state;
if (!inISR()) { if (!inISR()) {
dINT(); state = disableIRQ();
} }
int n = lifo_get(lifo); int n = lifo_get(lifo);
if (n == -1) { if (n == -1) {
if (!inISR()) { if (!inISR()) {
eINT(); restoreIRQ(state);
} }
puts("No hwtimer left."); puts("No hwtimer left.");
@ -178,7 +180,7 @@ static int _hwtimer_set(unsigned long offset, void (*callback)(void*), void *ptr
lpm_prevent_sleep++; lpm_prevent_sleep++;
if (!inISR()) { if (!inISR()) {
eINT(); restoreIRQ(state);
} }
return n; return n;