projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/simple-quiet' into multiarch
[fw/altos]
/
src
/
core
/
ao_task.c
diff --git
a/src/core/ao_task.c
b/src/core/ao_task.c
index 32826114c4e5e855fa6e1159378c57321cb2c9ae..a19a6a6f5e62f1f484ea09991c89d30cae9c7b79 100644
(file)
--- a/
src/core/ao_task.c
+++ b/
src/core/ao_task.c
@@
-107,7
+107,6
@@
ao_sleep(__xdata void *wchan)
ao_cur_task->wchan = wchan;
);
ao_yield();
ao_cur_task->wchan = wchan;
);
ao_yield();
- ao_cur_task->alarm = 0;
if (ao_cur_task->wchan) {
ao_cur_task->wchan = NULL;
return 1;
if (ao_cur_task->wchan) {
ao_cur_task->wchan = NULL;
return 1;
@@
-135,6
+134,12
@@
ao_alarm(uint16_t delay)
ao_cur_task->alarm = 1;
}
ao_cur_task->alarm = 1;
}
+void
+ao_clear_alarm(void)
+{
+ ao_cur_task->alarm = 0;
+}
+
void
ao_exit(void)
{
void
ao_exit(void)
{