diff options
author | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
commit | 6e9bb9178356620bd47d9f2e31abf42b7f1a8f11 (patch) | |
tree | 6f04b5500462d1f6e26ebcba58c5e9cd56afd442 /src/kernel/ao_packet.h | |
parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
parent | 87c8bb3956897830da1f7aaca2990a9571767b73 (diff) |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kernel/ao_packet.h')
-rw-r--r-- | src/kernel/ao_packet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel/ao_packet.h b/src/kernel/ao_packet.h index b8426cf9..136609c3 100644 --- a/src/kernel/ao_packet.h +++ b/src/kernel/ao_packet.h @@ -54,7 +54,7 @@ void ao_packet_send(void); uint8_t -ao_packet_recv(void); +ao_packet_recv(uint16_t timeout); void ao_packet_flush(void); |