X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_usb.c;h=e4af8e454625c87e1457b44475a33608d4155acb;hb=bb46c9a1da5788a082e4483e576a5a6d3963507b;hp=8926b9ca3102378667471f7030ad9151790ea753;hpb=d709a0688eff84e25e24d755850ef045d6b0c3de;p=fw%2Faltos

diff --git a/src/ao_usb.c b/src/ao_usb.c
index 8926b9ca..e4af8e45 100644
--- a/src/ao_usb.c
+++ b/src/ao_usb.c
@@ -53,7 +53,7 @@ ao_usb_isr(void) interrupt 6
 		ao_wakeup(&ao_usb_in_bytes);
 
 	if (USBOIF & (1 << AO_USB_OUT_EP))
-		ao_wakeup(&ao_usb_out_bytes);
+		ao_wakeup(&ao_stdin_ready);
 
 	if (USBCIF & USBCIF_RSTIF)
 		ao_usb_set_interrupts();
@@ -360,7 +360,7 @@ ao_usb_flush(void) __critical
 }
 
 void
-ao_usb_putchar(char c) __critical
+ao_usb_putchar(char c) __critical __reentrant
 {
 	if (!ao_usb_running)
 		return;
@@ -374,17 +374,16 @@ ao_usb_putchar(char c) __critical
 }
 
 char
-ao_usb_getchar(void) __critical
+ao_usb_pollchar(void) __critical
 {
-	__xdata char	c;
-	while (ao_usb_out_bytes == 0) {
-		for (;;) {
-			USBINDEX = AO_USB_OUT_EP;
-			if ((USBCSOL & USBCSOL_OUTPKT_RDY) != 0)
-				break;
-			ao_sleep(&ao_usb_out_bytes);
-		}
+	char c;
+	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];
@@ -395,6 +394,16 @@ ao_usb_getchar(void) __critical
 	return c;
 }
 
+char
+ao_usb_getchar(void) __critical
+{
+	char	c;
+
+	while ((c = ao_usb_pollchar()) == AO_READ_AGAIN)
+		ao_sleep(&ao_stdin_ready);
+	return c;
+}
+
 void
 ao_usb_enable(void)
 {
@@ -438,4 +447,5 @@ ao_usb_init(void)
 	ao_usb_enable();
 
 	ao_add_task(&ao_usb_task, ao_usb_ep0, "usb");
+	ao_add_stdio(ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
 }