projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix command-line FAT filename parsing
[fw/altos]
/
src
/
drivers
/
ao_packet.c
diff --git
a/src/drivers/ao_packet.c
b/src/drivers/ao_packet.c
index 3c1e7a18eb643168be3520e558f0ee6781ce963f..5a50747888a01225da2a8bc7cbe0f6dd247f7334 100644
(file)
--- a/
src/drivers/ao_packet.c
+++ b/
src/drivers/ao_packet.c
@@
-21,8
+21,8
@@
__xdata struct ao_packet_recv ao_rx_packet;
__xdata struct ao_packet ao_tx_packet;
__pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
__xdata struct ao_packet ao_tx_packet;
__pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
-static __xdata
char
tx_data[AO_PACKET_MAX];
-static __xdata
char
rx_data[AO_PACKET_MAX];
+static __xdata
uint8_t
tx_data[AO_PACKET_MAX];
+static __xdata
uint8_t
rx_data[AO_PACKET_MAX];
static __pdata uint8_t rx_seq;
__xdata struct ao_task ao_packet_task;
static __pdata uint8_t rx_seq;
__xdata struct ao_task ao_packet_task;
@@
-169,12
+169,10
@@
ao_packet_putchar(char c) __reentrant
tx_data[ao_packet_tx_used++] = c;
}
tx_data[ao_packet_tx_used++] = c;
}
-char
-ao_packet_pollchar(void)
+/* May be called with interrupts blocked */
+int
+_ao_packet_pollchar(void)
{
{
- /* No need to block interrupts, all variables here
- * are only manipulated in task context
- */
if (!ao_packet_enable)
return AO_READ_AGAIN;
if (!ao_packet_enable)
return AO_READ_AGAIN;