libaltos: cjnitest needs altos_flush now

[fw/altos] / src / ao_usb.c

diff --git a/src/ao_usb.c b/src/ao_usb.c
index 527e9b302ec387355317b447c7cacad1ea926540..b55130f2b73366dff311d0130133eb5b5b05ddc3 100644 (file)
--- a/src/ao_usb.c
+++ b/src/ao_usb.c
@@ -43,7 +43,7 @@ ao_usb_set_interrupts(void)
  * so when we hook that up, fix this
  */
 void
-ao_usb_isr(void) interrupt 6
+ao_usb_isr(void) __interrupt 6
 {
        USBIF = 0;
        ao_usb_iif |= USBIIF;
@@ -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)
@@ -395,7 +396,7 @@ ao_usb_pollchar(void) __critical
 }
 
 char
-ao_usb_getchar(void)
+ao_usb_getchar(void) __critical
 {
        char    c;