X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_usb_stm.c;h=4e9d1f145cd98001e4378d3f8ea12050fc034e91;hp=11dde92eedf1d583df74c57252d3aa8e048dd1b9;hb=104b8bfc9b37fda175f2cb2a1e33601fbf6f48f6;hpb=106d212ff5920c39d95751ef6249dc141970412c

diff --git a/src/stm/ao_usb_stm.c b/src/stm/ao_usb_stm.c
index 11dde92e..4e9d1f14 100644
--- a/src/stm/ao_usb_stm.c
+++ b/src/stm/ao_usb_stm.c
@@ -117,9 +117,8 @@ static uint8_t	ao_usb_in_pending;
  * but not pulled to the shadow buffer.
  */
 static uint8_t	ao_usb_out_avail;
-static uint8_t	ao_usb_running;
+uint8_t		ao_usb_running;
 static uint8_t	ao_usb_configuration;
-static uint8_t	ueienx_0;
 
 #define AO_USB_EP0_GOT_RESET	1
 #define AO_USB_EP0_GOT_SETUP	2
@@ -313,7 +312,6 @@ ao_usb_init_ep(uint8_t ep, uint32_t addr, uint32_t type, uint32_t stat_rx, uint3
 static void
 ao_usb_set_ep0(void)
 {
-	uint32_t		epr;
 	int			e;
 
 	ao_usb_sram_addr = 0;
@@ -356,8 +354,6 @@ ao_usb_set_ep0(void)
 static void
 ao_usb_set_configuration(void)
 {
-	uint32_t		epr;
-
 	debug ("ao_usb_set_configuration\n");
 
 	/* Set up the INT end point */
@@ -572,7 +568,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)
@@ -731,6 +727,9 @@ ao_usb_ep0_handle(uint8_t receive)
 	if (receive & AO_USB_EP0_GOT_TX_ACK) {
 		debug ("\tgot tx ack\n");
 
+#if HAS_FLIGHT && AO_USB_FORCE_IDLE
+		ao_flight_force_idle = 1;
+#endif
 		/* Wait until the IN packet is received from addr 0
 		 * before assigning our local address
 		 */
@@ -965,7 +964,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();
 }