Merge branch 'master' into micropeak-logging

[fw/altos] / src / avr / ao_usb_avr.c

diff --git a/src/avr/ao_usb_avr.c b/src/avr/ao_usb_avr.c
index 9ba407af6f6a3e0f1027f4e5c5e5fa2378bfee6b..2ef546c98dc2d4d1f462bb2c042c9c9885a8df85 100644 (file)
--- a/src/avr/ao_usb_avr.c
+++ b/src/avr/ao_usb_avr.c
@@ -480,10 +480,10 @@ ao_usb_putchar(char c) __critical __reentrant
        ao_usb_in_flushed = 0;
 }
 
-static char
+static int
 _ao_usb_pollchar(void)
 {
-       char c;
+       uint8_t c;
        uint8_t intx;
 
        if (!ao_usb_running)
@@ -517,10 +517,10 @@ _ao_usb_pollchar(void)
        return c;
 }
 
-char
+int
 ao_usb_pollchar(void)
 {
-       char    c;
+       int     c;
        cli();
        c = _ao_usb_pollchar();
        sei();
@@ -530,7 +530,7 @@ ao_usb_pollchar(void)
 char
 ao_usb_getchar(void) __critical
 {
-       char    c;
+       int     c;
 
        cli();
        while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)