altos/lpc: HAS_USB_CONNECT has been changed to mean a custom pin

[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 144d10752b3ba2eb8642c1173586b4bb0eac71db..12f5d8e6973013c5c5113bbe9d50a97d509d9fd3 100644 (file)
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -58,6 +58,7 @@ static uint8_t        ao_usb_ep0_state;
 /* Pending EP0 IN data */
 static const uint8_t   *ao_usb_ep0_in_data;    /* Remaining data */
 static uint8_t                 ao_usb_ep0_in_len;      /* Remaining amount */
+static uint16_t                ao_usb_ep0_in_max;      /* Requested amount from host */
 
 /* Temp buffer for smaller EP0 in data */
 static uint8_t ao_usb_ep0_in_buf[2];
@@ -108,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
@@ -245,11 +245,13 @@ ao_usb_epn_in(uint8_t n)
        return &lpc_usb_endpoint.epn[n-1].in[0];
 }
 
+#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)
@@ -316,6 +318,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)
 {
@@ -326,11 +335,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;
@@ -346,7 +352,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
@@ -376,10 +382,11 @@ ao_usb_ep0_flush(void)
        if (this_len > AO_USB_CONTROL_SIZE)
                this_len = AO_USB_CONTROL_SIZE;
 
-       if (this_len < AO_USB_CONTROL_SIZE)
-               ao_usb_ep0_state = AO_USB_EP0_IDLE;
-
        ao_usb_ep0_in_len -= this_len;
+       ao_usb_ep0_in_max -= this_len;
+
+       if (this_len < AO_USB_CONTROL_SIZE || ao_usb_ep0_in_max == 0)
+               ao_usb_ep0_state = AO_USB_EP0_IDLE;
 
        debug_data ("Flush EP0 len %d:", this_len);
        memcpy(ao_usb_ep0_tx_buffer, ao_usb_ep0_in_data, this_len);
@@ -450,8 +457,9 @@ 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)
 {
+       ao_usb_ep0_in_max = max;
        /* Don't send more than asked for */
        if (ao_usb_ep0_in_len > max)
                ao_usb_ep0_in_len = max;
@@ -590,7 +598,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) {
@@ -626,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)
@@ -658,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");
@@ -668,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);
@@ -862,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) |
@@ -936,11 +949,11 @@ ao_usb_enable(void)
        for (t = 0; t < 1000; t++)
                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
-
-       ao_usb_set_ep0();
 }
 
 #if USB_ECHO