static volatile void *ao_wchan;
uint8_t
-ao_sleep(__xdata void *wchan)
+ao_sleep(void *wchan)
{
#if 1
ao_wchan = wchan;
#if HAS_AO_DELAY
void
-ao_delay(uint16_t ticks)
+ao_delay_until(AO_TICK_TYPE target)
{
- AO_TICK_TYPE target;
-
- if (!ticks)
- ticks = 1;
- target = ao_tick_count + ticks;
- do {
- ao_sleep(&ao_time);
- } while ((int16_t) (target - ao_tick_count) > 0);
+ ao_arch_block_interrupts();
+ while ((AO_TICK_SIGNED) (target - ao_tick_count) > 0)
+ ao_sleep((void *) &ao_tick_count);
+ ao_arch_release_interrupts();
}
+
+void
+ao_delay(AO_TICK_TYPE ticks)
+{
+ ao_delay_until(ao_time() + ticks);
+}
+
#endif
void
-ao_wakeup(__xdata void *wchan)
+ao_wakeup(void *wchan)
{
(void) wchan;
ao_wchan = 0;