altosui: Set callsign when fetching eeprom data over the air

[fw/altos] / src / ao_usb.c

diff --git a/src/ao_usb.c b/src/ao_usb.c
index daca71a734e911995045318b6afe802ac60b3581..f6e0fcf91b54e83e643b46eeec599f5dacce06db 100644 (file)
--- a/src/ao_usb.c
+++ b/src/ao_usb.c
@@ -82,10 +82,11 @@ ao_usb_ep0_flush(void)
        __xdata uint8_t this_len;
        __xdata uint8_t cs0;
 
+       /* If the IN packet hasn't been picked up, just return */
        USBINDEX = 0;
        cs0 = USBCS0;
        if (cs0 & USBCS0_INPKT_RDY)
-               ao_panic(0);
+               return;
 
        this_len = ao_usb_ep0_in_len;
        if (this_len > AO_USB_CONTROL_SIZE)
@@ -377,11 +378,13 @@ char
 ao_usb_pollchar(void) __critical
 {
        char c;
-       while (ao_usb_out_bytes == 0) {
+       if (ao_usb_out_bytes == 0) {
                USBINDEX = AO_USB_OUT_EP;
                if ((USBCSOL & USBCSOL_OUTPKT_RDY) == 0)
                        return AO_READ_AGAIN;
                ao_usb_out_bytes = (USBCNTH << 8) | USBCNTL;
+               if (ao_usb_out_bytes == 0)
+                       return AO_READ_AGAIN;
        }
        --ao_usb_out_bytes;
        c = USBFIFO[AO_USB_OUT_EP << 1];
@@ -393,7 +396,7 @@ ao_usb_pollchar(void) __critical
 }
 
 char
-ao_usb_getchar(void)
+ao_usb_getchar(void) __critical
 {
        char    c;