X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_usb.c;h=e4af8e454625c87e1457b44475a33608d4155acb;hp=99f0715bb9536f658b8fd60c7567fcdec5b9e28b;hb=e6bb80975fde20928a830170f0821d59a8c72690;hpb=210dbaa23cdacf3a6f2d6e23493e96ee2ac9bca7

diff --git a/src/ao_usb.c b/src/ao_usb.c
index 99f0715b..e4af8e45 100644
--- a/src/ao_usb.c
+++ b/src/ao_usb.c
@@ -21,6 +21,7 @@
 struct ao_task __xdata ao_usb_task;
 
 static __xdata uint16_t	ao_usb_in_bytes;
+static __xdata uint16_t ao_usb_in_bytes_last;
 static __xdata uint16_t	ao_usb_out_bytes;
 static __xdata uint8_t	ao_usb_iif;
 static __xdata uint8_t	ao_usb_running;
@@ -52,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();
@@ -71,7 +72,7 @@ uint8_t * __xdata ao_usb_ep0_in_data;
 __xdata uint8_t ao_usb_ep0_in_len;
 __xdata uint8_t	ao_usb_ep0_in_buf[2];
 __xdata uint8_t ao_usb_ep0_out_len;
-__xdata uint8_t *__data ao_usb_ep0_out_data;
+__xdata uint8_t *__xdata ao_usb_ep0_out_data;
 __xdata uint8_t ao_usb_configuration;
 
 /* Send an IN data packet */
@@ -321,47 +322,68 @@ ao_usb_ep0(void)
 	}
 }
 
-void
-ao_usb_flush(void) __critical
+/* Wait for a free IN buffer */
+static void
+ao_usb_in_wait(void)
 {
-	if (ao_usb_in_bytes) {
+	for (;;) {
 		USBINDEX = AO_USB_IN_EP;
-		USBCSIL |= USBCSIL_INPKT_RDY;
-		ao_usb_in_bytes = 0;
+		if ((USBCSIL & USBCSIL_INPKT_RDY) == 0)
+			break;
+		ao_sleep(&ao_usb_in_bytes);
 	}
 }
 
+/* Send the current IN packet */
+static void
+ao_usb_in_send(void)
+{
+	USBINDEX = AO_USB_IN_EP;
+	USBCSIL |= USBCSIL_INPKT_RDY;
+	ao_usb_in_bytes_last = ao_usb_in_bytes;
+	ao_usb_in_bytes = 0;
+}
+
 void
-ao_usb_putchar(char c) __critical
+ao_usb_flush(void) __critical
 {
 	if (!ao_usb_running)
 		return;
-	for (;;) {
-		USBINDEX = AO_USB_IN_EP;
-		if ((USBCSIL & USBCSIL_INPKT_RDY) == 0)
-			break;
-		ao_sleep(&ao_usb_in_bytes);
+
+	/* If there are pending bytes, or if the last packet was full,
+	 * send another IN packet
+	 */
+	if (ao_usb_in_bytes || (ao_usb_in_bytes_last == AO_USB_IN_SIZE)) {
+		ao_usb_in_wait();
+		ao_usb_in_send();
 	}
+}
+
+void
+ao_usb_putchar(char c) __critical __reentrant
+{
+	if (!ao_usb_running)
+		return;
+
+	ao_usb_in_wait();
+
+	/* Queue a byte, sending the packet when full */
 	USBFIFO[AO_USB_IN_EP << 1] = c;
-	if (++ao_usb_in_bytes == AO_USB_IN_SIZE) {
-		USBINDEX = AO_USB_IN_EP;
-		USBCSIL |= USBCSIL_INPKT_RDY;
-		ao_usb_in_bytes = 0;
-	}
+	if (++ao_usb_in_bytes == AO_USB_IN_SIZE)
+		ao_usb_in_send();
 }
 
 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];
@@ -372,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)
 {
@@ -415,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);
 }