X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Flpc%2Fao_usb_lpc.c;h=713fbc53f599714c873cb3af99d7cf4a2a187698;hb=1ab12861c3e70d7c22b27d988546a925616a0adc;hp=aac0df04a8956f5b485dfcc9940ac4814fe571ef;hpb=fd5567882b732f8947b44b217552077c82a3d28e;p=fw%2Faltos

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index aac0df04..713fbc53 100644
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -19,6 +19,16 @@
 #include "ao_usb.h"
 #include "ao_product.h"
 
+#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
+
 #define USB_DEBUG 	0
 #define USB_DEBUG_DATA	0
 #define USB_ECHO	0
@@ -35,8 +45,6 @@
 #define debug_data(format, args...)
 #endif
 
-struct ao_task ao_usb_task;
-
 struct ao_usb_setup {
 	uint8_t		dir_type_recip;
 	uint8_t		request;
@@ -308,6 +316,13 @@ ao_usb_disable_epn(uint8_t n)
 	ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].in[1]);
 }
 
+static void
+ao_usb_reset(void)
+{
+	ao_usb_set_address(0);
+	ao_usb_configuration = 0;
+}
+
 static void
 ao_usb_set_ep0(void)
 {
@@ -318,11 +333,8 @@ ao_usb_set_ep0(void)
 	lpc_usb.epinuse = 0;
 	lpc_usb.epskip = 0xffffffff;
 
-	ao_usb_set_address(0);
 	lpc_usb.intstat = 0xc00003ff;
 
-	ao_usb_configuration = 0;
-
 	ao_usb_sram = lpc_usb_sram;
 
 	lpc_usb.epliststart = (uint32_t) (intptr_t) &lpc_usb_endpoint;
@@ -338,7 +350,7 @@ ao_usb_set_ep0(void)
 	/* Clear all of the other endpoints */
 	for (e = 1; e <= 4; e++)
 		ao_usb_disable_epn(e);
-
+	ao_usb_reset();
 }
 
 static void
@@ -442,7 +454,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)
@@ -582,7 +594,7 @@ ao_usb_ep0_handle(uint8_t receive)
 
 	if (receive & AO_USB_EP0_GOT_RESET) {
 		debug ("\treset\n");
-		ao_usb_set_ep0();
+		ao_usb_reset();
 		return;
 	}
 	if (receive & AO_USB_EP0_GOT_SETUP) {
@@ -654,7 +666,7 @@ lpc_usb_irq_isr(void)
 		_rx_dbg1("RX ISR", *ao_usb_epn_out(AO_USB_OUT_EP));
 		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");
 	}
 
@@ -813,7 +825,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;
 }
@@ -823,6 +835,9 @@ ao_usb_disable(void)
 {
 	ao_arch_block_interrupts();
 
+#if HAS_USB_PULLUP
+	ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
 	/* Disable interrupts */
 	lpc_usb.inten = 0;
 
@@ -834,8 +849,9 @@ ao_usb_disable(void)
 	/* Turn off USB clock */
 	lpc_scb.usbclkdiv = 0;
 
-	/* Disable USB PHY */
-	lpc_scb.pdruncfg |= (1 << LPC_SCB_PDRUNCFG_USBPAD_PD);
+	/* Disable USB PHY and PLL */
+	lpc_scb.pdruncfg |= ((1 << LPC_SCB_PDRUNCFG_USBPAD_PD) |
+			     (1 << LPC_SCB_PDRUNCFG_USBPLL_PD));
 
 	/* Disable USB registers and RAM */
 	lpc_scb.sysahbclkctrl &= ~((1 << LPC_SCB_SYSAHBCLKCTRL_USB) |
@@ -877,7 +893,6 @@ ao_usb_enable(void)
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_USBPLL_PD);
 
 	lpc_scb.usbpllclksel = (LPC_SCB_SYSPLLCLKSEL_SEL_SYSOSC << LPC_SCB_SYSPLLCLKSEL_SEL);
-	lpc_scb.usbpllclkuen = (1 << LPC_SCB_USBPLLCLKUEN_ENA);
 	lpc_scb.usbpllclkuen = (0 << LPC_SCB_USBPLLCLKUEN_ENA);
 	lpc_scb.usbpllclkuen = (1 << LPC_SCB_USBPLLCLKUEN_ENA);
 	while (!(lpc_scb.usbpllclkuen & (1 << LPC_SCB_USBPLLCLKUEN_ENA)))
@@ -887,6 +902,10 @@ ao_usb_enable(void)
 		;
 
 	lpc_scb.usbclksel = 0;
+	lpc_scb.usbclkuen = (0 << LPC_SCB_USBCLKUEN_ENA);
+	lpc_scb.usbclkuen = (1 << LPC_SCB_USBCLKUEN_ENA);
+	while (!(lpc_scb.usbclkuen & (1 << LPC_SCB_USBCLKUEN_ENA)))
+		;
 
 	/* Turn on USB clock, use 48MHz clock unchanged */
 	lpc_scb.usbclkdiv = 1;
@@ -922,6 +941,10 @@ ao_usb_enable(void)
 		ao_arch_nop();
 
 	ao_usb_set_ep0();
+
+#if HAS_USB_PULLUP
+	ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 1);
+#endif
 }
 
 #if USB_ECHO
@@ -957,6 +980,10 @@ __code struct ao_cmds ao_usb_cmds[] = {
 void
 ao_usb_init(void)
 {
+#if HAS_USB_PULLUP
+	ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
+
 	ao_usb_enable();
 
 	debug ("ao_usb_init\n");
@@ -966,7 +993,7 @@ ao_usb_init(void)
 #if USB_DEBUG
 	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
 }