altos: add telebt-v0.0 Makefile

[fw/altos] / src / ao_usb.c

diff --git a/src/ao_usb.c b/src/ao_usb.c
index b55130f2b73366dff311d0130133eb5b5b05ddc3..ece6756a030c05bd104e1507a78879bafd54acac 100644 (file)
--- a/src/ao_usb.c
+++ b/src/ao_usb.c
@@ -46,6 +46,7 @@ void
 ao_usb_isr(void) __interrupt 6
 {
        USBIF = 0;
+       IRCON2 &= ~IRCON2_USBIF;
        ao_usb_iif |= USBIIF;
        if (ao_usb_iif & 1)
                ao_wakeup(&ao_usb_task);
@@ -57,6 +58,9 @@ ao_usb_isr(void) __interrupt 6
 
        if (USBCIF & USBCIF_RSTIF)
                ao_usb_set_interrupts();
+#if HAS_BTM
+       ao_btm_isr();
+#endif
 }
 
 struct ao_usb_setup {
@@ -383,8 +387,11 @@ ao_usb_pollchar(void) __critical
                if ((USBCSOL & USBCSOL_OUTPKT_RDY) == 0)
                        return AO_READ_AGAIN;
                ao_usb_out_bytes = (USBCNTH << 8) | USBCNTL;
-               if (ao_usb_out_bytes == 0)
+               if (ao_usb_out_bytes == 0) {
+                       USBINDEX = AO_USB_OUT_EP;
+                       USBCSOL &= ~USBCSOL_OUTPKT_RDY;
                        return AO_READ_AGAIN;
+               }
        }
        --ao_usb_out_bytes;
        c = USBFIFO[AO_USB_OUT_EP << 1];