altos: Switch ao_rssi.c __xdata to __pdata

[fw/altos] / src / ao_usb.c

diff --git a/src/ao_usb.c b/src/ao_usb.c
index f6e0fcf91b54e83e643b46eeec599f5dacce06db..e4b7938d8e85215fdabfc37be02b0e3c9e1386cb 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;
@@ -57,6 +57,11 @@ ao_usb_isr(void) interrupt 6
 
        if (USBCIF & USBCIF_RSTIF)
                ao_usb_set_interrupts();
+#if HAS_BTM
+#if BT_LINK_ON_P2
+       ao_btm_isr();
+#endif
+#endif
 }
 
 struct ao_usb_setup {
@@ -383,8 +388,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];