altos/lpc: Reset less of the device on USB reset.

[fw/altos] / src / lpc / ao_usb_lpc.c

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index 4e6b9c664b7e2d6e1d207fbd58d89e539f88cba0..713fbc53f599714c873cb3af99d7cf4a2a187698 100644 (file)
--- 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
@@ -306,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)
 {
@@ -316,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;
@@ -336,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
@@ -440,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)
@@ -580,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) {
@@ -652,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");
        }
 
@@ -811,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;
 }
@@ -821,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;
 
@@ -924,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
@@ -959,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");
@@ -968,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
 }