diff options
| author | Keith Packard <keithp@keithp.com> | 2015-02-13 23:51:10 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-02-13 23:51:10 -0800 |
| commit | f4c812bef76a2cd95f675cb27ea89059561ceec7 (patch) | |
| tree | 9244ec29ee751a3384f7a0249714d9109934df7c /src/kernel/ao_task.h | |
| parent | 1445725b983134d5a967dee88ef997bf15d4a422 (diff) | |
altos: Replace ao_alarm/ao_clear_alarm with ao_sleep_for
Having arbitrary alarms firing in the middle of complicated device
logic makes no sense at all. Therefore only correct use of ao_alarm
and ao_clear_alarm was around a specific ao_sleep call, with correct
recovery in case the alarm fires.
This patch replaces all uses of ao_alarm/ao_sleep/ao_clear_alarm with
ao_sleep_for, a new function which takes the alarm timeout directly.
A few cases which weren't simply calling ao_sleep have been reworked
to pass the timeout value down to the place where sleep *is* being
called, and having that code deal with the return correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/kernel/ao_task.h')
| -rw-r--r-- | src/kernel/ao_task.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/kernel/ao_task.h b/src/kernel/ao_task.h index 9c56b480..c6bec0e3 100644 --- a/src/kernel/ao_task.h +++ b/src/kernel/ao_task.h @@ -68,10 +68,19 @@ extern __data uint8_t ao_task_minimize_latency; /* Reduce IRQ latency */ uint8_t ao_sleep(__xdata void *wchan); +/* Suspend the current task until wchan is awoken or the timeout + * expires. returns: + * 0 on normal wake + * 1 on alarm + */ +uint8_t +ao_sleep_for(__xdata void *wchan, uint16_t timeout); + /* Wake all tasks sleeping on wchan */ void ao_wakeup(__xdata void *wchan) __reentrant; +#if 0 /* set an alarm to go off in 'delay' ticks */ void ao_alarm(uint16_t delay); @@ -79,6 +88,7 @@ ao_alarm(uint16_t delay); /* Clear any pending alarm */ void ao_clear_alarm(void); +#endif /* Yield the processor to another task */ void |