summaryrefslogtreecommitdiff
path: root/src/kernel/ao_pyro.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2015-07-16 13:31:42 -0600
committerBdale Garbee <bdale@gag.com>2015-07-16 13:31:42 -0600
commit6e9bb9178356620bd47d9f2e31abf42b7f1a8f11 (patch)
tree6f04b5500462d1f6e26ebcba58c5e9cd56afd442 /src/kernel/ao_pyro.c
parente2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff)
parent87c8bb3956897830da1f7aaca2990a9571767b73 (diff)
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kernel/ao_pyro.c')
-rw-r--r--src/kernel/ao_pyro.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index 3044d565..43e73de4 100644
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -375,9 +375,7 @@ ao_pyro(void)
ao_sleep(&ao_flight_state);
for (;;) {
- ao_alarm(AO_MS_TO_TICKS(100));
- ao_sleep(&ao_pyro_wakeup);
- ao_clear_alarm();
+ ao_sleep_for(&ao_pyro_wakeup, AO_MS_TO_TICKS(100));
if (ao_flight_state >= ao_flight_landed)
break;
any_waiting = ao_pyro_check();