diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-22 14:55:40 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-22 14:55:40 -0700 |
| commit | 4af4e36cda96d053458eeb040e35886890917385 (patch) | |
| tree | 2b1b870b5b15af2fea0297b8cc9a5dff73d265df /src/drivers/ao_packet_master.c | |
| parent | 91b1a80650a7dcd7c5bf819618a8cea0fceb37d9 (diff) | |
| parent | 106b16b4d5d024543d7ad8c4b4762151e253f3c4 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/drivers/ao_packet_master.c')
| -rw-r--r-- | src/drivers/ao_packet_master.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c index 42a4f5bf..5e440db0 100644 --- a/src/drivers/ao_packet_master.c +++ b/src/drivers/ao_packet_master.c @@ -97,9 +97,7 @@ ao_packet_master(void) if (ao_tx_packet.len) ao_packet_master_busy(); ao_packet_master_check_busy(); - ao_alarm(AO_PACKET_MASTER_RECV_DELAY); - r = ao_packet_recv(); - ao_clear_alarm(); + r = ao_packet_recv(AO_PACKET_MASTER_RECV_DELAY); if (r) { /* if we can transmit data, do so */ if (ao_packet_tx_used && ao_tx_packet.len == 0) @@ -107,9 +105,7 @@ ao_packet_master(void) if (ao_rx_packet.packet.len) ao_packet_master_busy(); ao_packet_master_sleeping = 1; - ao_alarm(ao_packet_master_delay); - ao_sleep(&ao_packet_master_sleeping); - ao_clear_alarm(); + ao_sleep_for(&ao_packet_master_sleeping, ao_packet_master_delay); ao_packet_master_sleeping = 0; } } |