projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/master'
[fw/altos]
/
src
/
stm
/
ao_usb_stm.c
diff --git
a/src/stm/ao_usb_stm.c
b/src/stm/ao_usb_stm.c
index d93a0c174c16a7a851669241fa98fbd68083d2d9..9379e5cd62efd19a8cdf994669fa171be0a9f11b 100644
(file)
--- a/
src/stm/ao_usb_stm.c
+++ b/
src/stm/ao_usb_stm.c
@@
-873,10
+873,10
@@
_ao_usb_out_recv(void)
ao_usb_set_stat_rx(AO_USB_OUT_EPR, STM_USB_EPR_STAT_RX_VALID);
}
ao_usb_set_stat_rx(AO_USB_OUT_EPR, STM_USB_EPR_STAT_RX_VALID);
}
-static
char
+static
int
_ao_usb_pollchar(void)
{
_ao_usb_pollchar(void)
{
-
char
c;
+
uint8_t
c;
if (!ao_usb_running)
return AO_READ_AGAIN;
if (!ao_usb_running)
return AO_READ_AGAIN;
@@
-896,10
+896,10
@@
_ao_usb_pollchar(void)
return c;
}
return c;
}
-char
+int
ao_usb_pollchar(void)
{
ao_usb_pollchar(void)
{
-
char
c;
+
int
c;
ao_arch_block_interrupts();
c = _ao_usb_pollchar();
ao_arch_release_interrupts();
ao_arch_block_interrupts();
c = _ao_usb_pollchar();
ao_arch_release_interrupts();
@@
-909,7
+909,7
@@
ao_usb_pollchar(void)
char
ao_usb_getchar(void)
{
char
ao_usb_getchar(void)
{
-
char
c;
+
int
c;
ao_arch_block_interrupts();
while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)
ao_arch_block_interrupts();
while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)