X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_usb_stm.c;h=28a9f9f3e4643beac09b0db8a0dcf6e56c348fc9;hp=e484cd22f03c58ae0e9cb319e91a6d0bcb5d91fe;hb=0673344289772ed89483948184d6608c272c7c26;hpb=168188f6650dc9a777d57f9c7a8ff1be957bc892

diff --git a/src/stm/ao_usb_stm.c b/src/stm/ao_usb_stm.c
index e484cd22..28a9f9f3 100644
--- a/src/stm/ao_usb_stm.c
+++ b/src/stm/ao_usb_stm.c
@@ -23,6 +23,16 @@
 #define USB_DEBUG_DATA	0
 #define USB_ECHO	0
 
+#ifndef USE_USB_STDIO
+#define USE_USB_STDIO	1
+#endif
+
+#if USE_USB_STDIO
+#define AO_USB_OUT_SLEEP_ADDR	(&ao_stdin_ready)
+#else
+#define AO_USB_OUT_SLEEP_ADDR	(&ao_usb_out_avail)
+#endif
+
 #if USB_DEBUG
 #define debug(format, args...)	printf(format, ## args);
 #else
@@ -562,7 +572,7 @@ ao_usb_ep0_out_set(uint8_t *data, uint8_t len)
 }
 
 static void
-ao_usb_ep0_in_start(uint8_t max)
+ao_usb_ep0_in_start(uint16_t max)
 {
 	/* Don't send more than asked for */
 	if (ao_usb_ep0_in_len > max)
@@ -770,7 +780,7 @@ stm_usb_lp_isr(void)
 				_rx_dbg1("RX ISR", epr);
 				ao_usb_out_avail = 1;
 				_rx_dbg0("out avail set");
-				ao_wakeup(&ao_stdin_ready);
+				ao_wakeup(AO_USB_OUT_SLEEP_ADDR);
 				_rx_dbg0("stdin awoken");
 			}
 			break;
@@ -936,7 +946,7 @@ ao_usb_getchar(void)
 
 	ao_arch_block_interrupts();
 	while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)
-		ao_sleep(&ao_stdin_ready);
+		ao_sleep(AO_USB_OUT_SLEEP_ADDR);
 	ao_arch_release_interrupts();
 	return c;
 }
@@ -955,7 +965,7 @@ ao_usb_disable(void)
 	stm_usb.cntr = (1 << STM_USB_CNTR_PDWN) | (1 << STM_USB_CNTR_FRES);
 
 	/* Disable the interface */
-	stm_rcc.apb1enr &+ ~(1 << STM_RCC_APB1ENR_USBEN);
+	stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_USBEN);
 	ao_arch_release_interrupts();
 }
 
@@ -1064,8 +1074,10 @@ ao_usb_init(void)
 	ao_cmd_register(&ao_usb_cmds[0]);
 #endif
 #if !USB_ECHO
+#if USE_USB_STDIO
 	ao_add_stdio(_ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
 #endif
+#endif
 }
 
 #if TX_DBG || RX_DBG