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>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/cc1111/ao_button.c b/src/cc1111/ao_button.c
index 69f3475f..a0f221c2 100644
--- a/src/cc1111/ao_button.c
+++ b/src/cc1111/ao_button.c
@@ -72,12 +72,12 @@ ao_button_mask(uint8_t reg)
 }
 
 char
-ao_button_get(void) __critical
+ao_button_get(uint16_t timeout) __critical
 {
 	char	b;
 
 	while (ao_fifo_empty(ao_button_fifo))
-		if (ao_sleep(&ao_button_fifo))
+		if (ao_sleep_for(&ao_button_fifo, timeout))
 			return 0;
 	ao_fifo_remove(ao_button_fifo, b);
 	return b;