Set version to 1.5.9.1

[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 686dc3a4bd8019d6c2e44251c1bbb10a01f586be..499de9e9841ca2ff295347fb2243691163241572 100644 (file)
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -80,14 +80,12 @@ static uint8_t      *ao_usb_ep0_setup_buffer;
 static uint8_t *ao_usb_ep0_rx_buffer;
 
 /* Pointer to bulk data tx/rx buffers in USB memory */
-static uint8_t *ao_usb_in_tx_buffer;
-static uint8_t *ao_usb_out_rx_buffer;
-
-/* Our data buffers */
-static uint8_t ao_usb_tx_buffer[AO_USB_IN_SIZE];
+static uint8_t *ao_usb_in_tx_buffer[2];
+static uint8_t ao_usb_in_tx_cur;
 static uint8_t ao_usb_tx_count;
 
-static uint8_t ao_usb_rx_buffer[AO_USB_OUT_SIZE];
+static uint8_t *ao_usb_out_rx_buffer[2];
+static uint8_t ao_usb_out_rx_cur;
 static uint8_t ao_usb_rx_count, ao_usb_rx_pos;
 
 extern struct lpc_usb_endpoint lpc_usb_endpoint;
@@ -108,10 +106,9 @@ static uint8_t     ao_usb_in_pending;
 /* Marks when an OUT packet has been received by the hardware
  * but not pulled to the shadow buffer.
  */
-static uint8_t ao_usb_out_avail;
-static uint8_t ao_usb_running;
+uint8_t                ao_usb_out_avail;
+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
@@ -246,11 +243,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)
@@ -361,12 +360,16 @@ ao_usb_set_configuration(void)
 
        /* Set up the INT end point */
        ao_usb_enable_epn(AO_USB_INT_EP, 0, NULL, 0, NULL);
-       
+
        /* Set up the OUT end point */
-       ao_usb_enable_epn(AO_USB_OUT_EP, AO_USB_OUT_SIZE, &ao_usb_out_rx_buffer, 0, NULL);
+       ao_usb_enable_epn(AO_USB_OUT_EP, AO_USB_OUT_SIZE * 2, &ao_usb_out_rx_buffer[0], 0, NULL);
+       ao_usb_out_rx_buffer[1] = ao_usb_out_rx_buffer[0] + AO_USB_OUT_SIZE;
+       ao_usb_out_rx_cur = 0;
 
        /* Set up the IN end point */
-       ao_usb_enable_epn(AO_USB_IN_EP, 0, NULL, AO_USB_IN_SIZE, &ao_usb_in_tx_buffer);
+       ao_usb_enable_epn(AO_USB_IN_EP, 0, NULL, AO_USB_IN_SIZE * 2, &ao_usb_in_tx_buffer[0]);
+       ao_usb_in_tx_buffer[1] = ao_usb_in_tx_buffer[0] + AO_USB_IN_SIZE;
+       ao_usb_in_tx_cur = 0;
 
        ao_usb_running = 1;
 }
@@ -633,11 +636,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 +669,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 +681,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);
@@ -710,8 +718,8 @@ _ao_usb_in_send(void)
        ao_usb_in_pending = 1;
        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), ao_usb_in_tx_buffer[ao_usb_in_tx_cur], ao_usb_tx_count);
+       ao_usb_in_tx_cur = 1 - ao_usb_in_tx_cur;
        ao_usb_tx_count = 0;
        _tx_dbg0("in_send end");
 }
@@ -763,10 +771,12 @@ ao_usb_putchar(char c)
 
        ao_arch_block_interrupts();
        _ao_usb_in_wait();
+       ao_arch_release_interrupts();
 
        ao_usb_in_flushed = 0;
-       ao_usb_tx_buffer[ao_usb_tx_count++] = (uint8_t) c;
+       ao_usb_in_tx_buffer[ao_usb_in_tx_cur][ao_usb_tx_count++] = (uint8_t) c;
 
+       ao_arch_block_interrupts();
        /* Send the packet when full */
        if (ao_usb_tx_count == AO_USB_IN_SIZE) {
                _tx_dbg0("putchar full");
@@ -776,6 +786,43 @@ ao_usb_putchar(char c)
        ao_arch_release_interrupts();
 }
 
+void *
+ao_usb_alloc(uint16_t len)
+{
+       return ao_usb_alloc_sram(len);
+}
+
+void
+ao_usb_write(void *block, int len)
+{
+       uint8_t *b = block;
+       int this_time;
+
+       if (!ao_usb_running)
+               return;
+
+       if (!ao_usb_in_flushed)
+               ao_usb_flush();
+
+       while (len) {
+               ao_usb_in_flushed = 0;
+               this_time = AO_USB_IN_SIZE;
+               if (this_time > len)
+                       this_time = len;
+               b += this_time;
+               len -= this_time;
+
+               ao_arch_block_interrupts();
+               while (ao_usb_in_pending)
+                       ao_sleep(&ao_usb_in_pending);
+               ao_usb_in_pending = 1;
+               if (this_time != AO_USB_IN_SIZE)
+                       ao_usb_in_flushed = 1;
+               ao_usb_set_ep(ao_usb_epn_in(AO_USB_IN_EP), b, this_time);
+               ao_arch_release_interrupts();
+       }
+}
+
 static void
 _ao_usb_out_recv(void)
 {
@@ -786,13 +833,12 @@ _ao_usb_out_recv(void)
 
        _rx_dbg1("out_recv count", ao_usb_rx_count);
        debug ("recv %d\n", ao_usb_rx_count);
-       debug_data("Fill OUT len %d:", ao_usb_rx_count);
-       memcpy(ao_usb_rx_buffer, ao_usb_out_rx_buffer, ao_usb_rx_count);
-       debug_data("\n");
+       debug_data("Fill OUT len %d\n", ao_usb_rx_count);
        ao_usb_rx_pos = 0;
+       ao_usb_rx_out_cur = 1 - ao_usb_rx_out_cur;
 
        /* ACK the packet */
-       ao_usb_set_epn_out(AO_USB_OUT_EP, ao_usb_out_rx_buffer, AO_USB_OUT_SIZE);
+       ao_usb_set_epn_out(AO_USB_OUT_EP, ao_usb_out_rx_buffer[1-ao_usb_rx_out_cur], AO_USB_OUT_SIZE);
 }
 
 int
@@ -817,7 +863,7 @@ _ao_usb_pollchar(void)
        }
 
        /* Pull a character out of the fifo */
-       c = ao_usb_rx_buffer[ao_usb_rx_pos++];
+       c = ao_usb_rx_buffer[ao_usb_rx_out_cur][ao_usb_rx_pos++];
        return c;
 }
 
@@ -869,7 +915,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) |