X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_usb.c;h=ece6756a030c05bd104e1507a78879bafd54acac;hp=daca71a734e911995045318b6afe802ac60b3581;hb=19bfa3882a2d95fcade256c2d63ad24f794281e5;hpb=0b483233118673cbc2cda1be6acd379df82bc95a

diff --git a/src/ao_usb.c b/src/ao_usb.c
index daca71a7..ece6756a 100644
--- a/src/ao_usb.c
+++ b/src/ao_usb.c
@@ -43,9 +43,10 @@ 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;
+	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 {
@@ -82,10 +86,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 +382,16 @@ 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) {
+			USBINDEX = AO_USB_OUT_EP;
+			USBCSOL &= ~USBCSOL_OUTPKT_RDY;
+			return AO_READ_AGAIN;
+		}
 	}
 	--ao_usb_out_bytes;
 	c = USBFIFO[AO_USB_OUT_EP << 1];
@@ -393,7 +403,7 @@ ao_usb_pollchar(void) __critical
 }
 
 char
-ao_usb_getchar(void)
+ao_usb_getchar(void) __critical
 {
 	char	c;