X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_usb_avr.c;h=bd75b17d7a5cc21638ea2d02c81b04019525a8ad;hb=bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3;hp=fc8899d815c91d8771e12b3ec95a5673fdd5ce09;hpb=47c2c0b79dc516d2566ae149605b7d70ef2dca98;p=fw%2Faltos

diff --git a/src/avr/ao_usb_avr.c b/src/avr/ao_usb_avr.c
index fc8899d8..bd75b17d 100644
--- a/src/avr/ao_usb_avr.c
+++ b/src/avr/ao_usb_avr.c
@@ -330,17 +330,17 @@ ao_usb_ep0_setup(void)
 	case AO_USB_TYPE_CLASS:
 		debug ("Class setup packet\n");
 		switch (ao_usb_setup.request) {
-		case SET_LINE_CODING:
+		case AO_USB_SET_LINE_CODING:
 			debug ("set line coding\n");
 			ao_usb_ep0_out_len = 7;
 			ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
 			break;
-		case GET_LINE_CODING:
+		case AO_USB_GET_LINE_CODING:
 			debug ("get line coding\n");
 			ao_usb_ep0_in_len = 7;
 			ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
 			break;
-		case SET_CONTROL_LINE_STATE:
+		case AO_USB_SET_CONTROL_LINE_STATE:
 			break;
 		}
 		break;
@@ -411,7 +411,7 @@ ao_usb_ep0(void)
 
 /* Wait for a free IN buffer */
 static void
-ao_usb_in_wait(void)
+_ao_usb_in_wait(void)
 {
 	for (;;) {
 		/* Check if the current buffer is writable */
@@ -419,7 +419,6 @@ ao_usb_in_wait(void)
 		if (UEINTX & (1 << RWAL))
 			break;
 
-		cli();
 		/* Wait for an IN buffer to be ready */
 		for (;;) {
 			UENUM = AO_USB_IN_EP;
@@ -430,24 +429,24 @@ ao_usb_in_wait(void)
 		}
 		/* Ack the interrupt */
 		UEINTX &= ~(1 << TXINI);
-		sei();
 	}
 }
 
 /* Queue the current IN buffer for transmission */
 static void
-ao_usb_in_send(void)
+_ao_usb_in_send(void)
 {
 	UENUM = AO_USB_IN_EP;
 	UEINTX &= ~(1 << FIFOCON);
 }
 
 void
-ao_usb_flush(void) __critical
+ao_usb_flush(void)
 {
 	if (!ao_usb_running)
 		return;
 
+	ao_arch_block_interrupts();
 	/* Anytime we've sent a character since
 	 * the last time we flushed, we'll need
 	 * to send a packet -- the only other time
@@ -457,18 +456,20 @@ ao_usb_flush(void) __critical
 	 */
 	if (!ao_usb_in_flushed) {
 		ao_usb_in_flushed = 1;
-		ao_usb_in_wait();
-		ao_usb_in_send();
+		_ao_usb_in_wait();
+		_ao_usb_in_send();
 	}
+	ao_arch_release_interrupts();
 }
 
 void
-ao_usb_putchar(char c) __critical __reentrant
+ao_usb_putchar(char c)
 {
 	if (!ao_usb_running)
 		return;
 
-	ao_usb_in_wait();
+	ao_arch_block_interrupts();
+	_ao_usb_in_wait();
 
 	/* Queue a byte */
 	UENUM = AO_USB_IN_EP;
@@ -476,14 +477,15 @@ ao_usb_putchar(char c) __critical __reentrant
 
 	/* Send the packet when full */
 	if ((UEINTX & (1 << RWAL)) == 0)
-		ao_usb_in_send();
+		_ao_usb_in_send();
 	ao_usb_in_flushed = 0;
+	ao_arch_release_interrupts();
 }
 
-static char
+int
 _ao_usb_pollchar(void)
 {
-	char c;
+	uint8_t c;
 	uint8_t	intx;
 
 	if (!ao_usb_running)
@@ -518,24 +520,14 @@ _ao_usb_pollchar(void)
 }
 
 char
-ao_usb_pollchar(void)
-{
-	char	c;
-	cli();
-	c = _ao_usb_pollchar();
-	sei();
-	return c;
-}
-
-char
-ao_usb_getchar(void) __critical
+ao_usb_getchar(void)
 {
-	char	c;
+	int	c;
 
-	cli();
+	ao_arch_block_interrupts();
 	while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)
 		ao_sleep(&ao_stdin_ready);
-	sei();
+	ao_arch_release_interrupts();
 	return c;
 }
 
@@ -658,18 +650,6 @@ ao_usb_echo(void)
 }
 #endif
 
-static void
-ao_usb_irq(void)
-{
-	printf ("control: %d out: %d in: %d\n",
-		control_count, out_count, in_count);
-}
-
-__code struct ao_cmds ao_usb_cmds[] = {
-	{ ao_usb_irq, "i\0Show USB interrupt counts" },
-	{ 0, NULL }
-};
-
 void
 ao_usb_init(void)
 {
@@ -680,6 +660,5 @@ ao_usb_init(void)
 #if USB_DEBUG
 	ao_add_task(&ao_usb_echo_task, ao_usb_echo, "usb echo");
 #endif
-	ao_cmd_register(&ao_usb_cmds[0]);
-	ao_add_stdio(ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
+	ao_add_stdio(_ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
 }