projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ao_alarm
[fw/altos]
/
src
/
ao_task.c
diff --git
a/src/ao_task.c
b/src/ao_task.c
index 136444b0899ef0b6112544f507f7ca9e8b7d80fa..14aa84c841d698d3a285de7370c80de369c7b56f 100644
(file)
--- a/
src/ao_task.c
+++ b/
src/ao_task.c
@@
-129,6
+129,13
@@
ao_yield(void) _naked
break;
}
break;
}
+ /* Check if the alarm is set for a time which has passed */
+ if (ao_cur_task->alarm &&
+ (int16_t) (ao_time() - ao_cur_task->alarm) >= 0) {
+ ao_cur_task_index = ao_next_task_index;
+ break;
+ }
+
/* Enter lower power mode when there isn't anything to do */
if (ao_next_task_index == ao_cur_task_index)
PCON = PCON_IDLE;
/* Enter lower power mode when there isn't anything to do */
if (ao_next_task_index == ao_cur_task_index)
PCON = PCON_IDLE;
@@
-181,13
+188,20
@@
ao_yield(void) _naked
_endasm;
}
_endasm;
}
-void
+uint8_t
ao_sleep(__xdata void *wchan)
{
__critical {
ao_cur_task->wchan = wchan;
}
ao_yield();
ao_sleep(__xdata void *wchan)
{
__critical {
ao_cur_task->wchan = wchan;
}
ao_yield();
+ if (ao_cur_task->wchan) {
+ ao_cur_task->wchan = NULL;
+ ao_cur_task->alarm = 0;
+ return 1;
+ }
+ ao_cur_task->alarm = 0;
+ return 0;
}
void
}
void
@@
-200,6
+214,13
@@
ao_wakeup(__xdata void *wchan)
ao_tasks[i]->wchan = NULL;
}
ao_tasks[i]->wchan = NULL;
}
+void
+ao_alarm(uint16_t delay)
+{
+ if (!(ao_cur_task->alarm = ao_time() + delay))
+ ao_cur_task->alarm = 1;
+}
+
void
ao_wake_task(__xdata struct ao_task *task)
{
void
ao_wake_task(__xdata struct ao_task *task)
{