X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_usb_lpc.c;h=78fbac3985ea848e3a519c2c977562c193ab3774;hb=0671b3c8c24c9f33be77a10315c4669f33c516d7;hp=686dc3a4bd8019d6c2e44251c1bbb10a01f586be;hpb=a04c1dd5df76c9127615bc797a9d9f764eec1234;p=fw%2Faltos

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index 686dc3a4..78fbac39 100644
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -109,9 +109,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
@@ -235,46 +234,48 @@ ao_usb_ep0_in(void)
 }
 
 static inline vuint32_t *
-ao_usb_epn_out(uint8_t n)
+ao_usb_epn_out(uint8_t n, uint8_t i)
 {
-	return &lpc_usb_endpoint.epn[n-1].out[0];
+	return &lpc_usb_endpoint.epn[n-1].out[i];
 }
 
 static inline vuint32_t *
-ao_usb_epn_in(uint8_t n)
+ao_usb_epn_in(uint8_t n, uint8_t i)
 {
-	return &lpc_usb_endpoint.epn[n-1].in[0];
+	return &lpc_usb_endpoint.epn[n-1].in[i];
 }
 
+#if UNUSED
 static void
 ao_usb_set_epn_in(uint8_t n, uint8_t *addr, uint16_t nbytes)
 {
 	ao_usb_set_ep(ao_usb_epn_in(n), addr, nbytes);
 }
+#endif
 
 static void
 ao_usb_set_epn_out(uint8_t n, uint8_t *addr, uint16_t nbytes)
 {
-	ao_usb_set_ep(ao_usb_epn_out(n), addr, nbytes);
+	ao_usb_set_ep(ao_usb_epn_out(n, 0), addr, nbytes);
 }
 
 static inline uint16_t
 ao_usb_epn_out_count(uint8_t n)
 {
-	return ao_usb_ep_count(ao_usb_epn_out(n));
+	return ao_usb_ep_count(ao_usb_epn_out(n, 0));
 }
 
 static inline uint16_t
 ao_usb_epn_in_count(uint8_t n)
 {
-	return ao_usb_ep_count(ao_usb_epn_in(n));
+	return ao_usb_ep_count(ao_usb_epn_in(n, 0));
 }
 
 static uint8_t *
 ao_usb_enable_ep(vuint32_t *ep, uint16_t nbytes, uint16_t set_nbytes)
 {
 	uint8_t	*addr = ao_usb_alloc_sram(nbytes);
-	
+
 	ao_usb_set_ep(ep, addr, set_nbytes);
 	return addr;
 }
@@ -297,24 +298,24 @@ ao_usb_enable_epn(uint8_t n, uint16_t out_bytes, uint8_t **out_addr, uint16_t in
 {
 	uint8_t	*addr;
 
-	addr = ao_usb_enable_ep(ao_usb_epn_out(n), out_bytes, out_bytes);
+	addr = ao_usb_enable_ep(ao_usb_epn_out(n, 0), out_bytes, out_bytes);
 	if (out_addr)
 		*out_addr = addr;
-	ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].out[1]);
+	ao_usb_disable_ep(ao_usb_epn_out(n, 1));
 
-	addr = ao_usb_enable_ep(ao_usb_epn_in(n), in_bytes, 0);
+	addr = ao_usb_enable_ep(ao_usb_epn_in(n, 0), in_bytes, 0);
 	if (in_addr)
 		*in_addr = addr;
-	ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].in[1]);
+	ao_usb_disable_ep(ao_usb_epn_in(n, 1));
 }
 
 static void
 ao_usb_disable_epn(uint8_t n)
 {
-	ao_usb_disable_ep(ao_usb_epn_out(n));
-	ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].out[1]);
-	ao_usb_disable_ep(ao_usb_epn_in(n));
-	ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].in[1]);
+	ao_usb_disable_ep(ao_usb_epn_out(n, 0));
+	ao_usb_disable_ep(ao_usb_epn_out(n, 1));
+	ao_usb_disable_ep(ao_usb_epn_in(n, 0));
+	ao_usb_disable_ep(ao_usb_epn_in(n, 1));
 }
 
 static void
@@ -633,11 +634,12 @@ ao_usb_ep0_handle(uint8_t receive)
 	}
 }
 
-static uint16_t	control_count;
+#if USB_DEBUG
 static uint16_t int_count;
 static uint16_t	in_count;
 static uint16_t	out_count;
 static uint16_t	reset_count;
+#endif
 
 void
 lpc_usb_irq_isr(void)
@@ -665,7 +667,9 @@ lpc_usb_irq_isr(void)
 
 	/* Handle OUT packets */
 	if (intstat & (1 << LPC_USB_INT_EPOUT(AO_USB_OUT_EP))) {
+#if USB_DEBUG
 		++out_count;
+#endif
 		_rx_dbg1("RX ISR", *ao_usb_epn_out(AO_USB_OUT_EP));
 		ao_usb_out_avail = 1;
 		_rx_dbg0("out avail set");
@@ -675,7 +679,9 @@ lpc_usb_irq_isr(void)
 
 	/* Handle IN packets */
 	if (intstat & (1 << LPC_USB_INT_EPIN(AO_USB_IN_EP))) {
+#if USB_DEBUG
 		++in_count;
+#endif
 		_tx_dbg1("TX ISR", *ao_usb_epn_in(AO_USB_IN_EP));
 		ao_usb_in_pending = 0;
 		ao_wakeup(&ao_usb_in_pending);
@@ -711,7 +717,7 @@ _ao_usb_in_send(void)
 	if (ao_usb_tx_count != AO_USB_IN_SIZE)
 		ao_usb_in_flushed = 1;
 	memcpy(ao_usb_in_tx_buffer, ao_usb_tx_buffer, ao_usb_tx_count);
-	ao_usb_set_ep(ao_usb_epn_in(AO_USB_IN_EP), ao_usb_in_tx_buffer, ao_usb_tx_count);
+	ao_usb_set_ep(ao_usb_epn_in(AO_USB_IN_EP, 0), ao_usb_in_tx_buffer, ao_usb_tx_count);
 	ao_usb_tx_count = 0;
 	_tx_dbg0("in_send end");
 }
@@ -869,7 +875,7 @@ ao_usb_enable(void)
 	int	t;
 
 	/* Enable USB pins */
-#if HAS_USB_CONNECT
+#if HAS_LPC_USB_CONNECT
 	lpc_ioconf.pio0_6 = ((LPC_IOCONF_FUNC_USB_CONNECT << LPC_IOCONF_FUNC) |
 			     (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
 			     (0 << LPC_IOCONF_HYS) |
@@ -891,7 +897,7 @@ ao_usb_enable(void)
 
 	/* Enable USB PHY */
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_USBPAD_PD);
-	
+
 	/* Turn on USB PLL */
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_USBPLL_PD);
 
@@ -1038,7 +1044,7 @@ static void _dbg(int line, char *msg, uint32_t value)
 	dbg[dbg_i].primask = primask;
 #if TX_DBG
 	dbg[dbg_i].in_count = in_count;
-	dbg[dbg_i].in_ep = *ao_usb_epn_in(AO_USB_IN_EP);
+	dbg[dbg_i].in_ep = *ao_usb_epn_in(AO_USB_IN_EP, 0);
 	dbg[dbg_i].in_pending = ao_usb_in_pending;
 	dbg[dbg_i].tx_count = ao_usb_tx_count;
 	dbg[dbg_i].in_flushed = ao_usb_in_flushed;
@@ -1047,7 +1053,7 @@ static void _dbg(int line, char *msg, uint32_t value)
 	dbg[dbg_i].rx_count = ao_usb_rx_count;
 	dbg[dbg_i].rx_pos = ao_usb_rx_pos;
 	dbg[dbg_i].out_avail = ao_usb_out_avail;
-	dbg[dbg_i].out_ep = *ao_usb_epn_out(AO_USB_OUT_EP);
+	dbg[dbg_i].out_ep = *ao_usb_epn_out(AO_USB_OUT_EP, 0);
 #endif
 	if (++dbg_i == NUM_USB_DBG)
 		dbg_i = 0;