altos/lpc: Fix double-buffered USB changes

These got merged when we were down in Auckland, but before they'd been
finished. Transmitting worked fine, but receiving was mis-configuring
the OUT buffer size in the hardware.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index 499de9e9841ca2ff295347fb2243691163241572..af304b8afdd0653ebedf141ceac1d7dda194b193 100644 (file)
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -273,7 +273,7 @@ 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;
 }
@@ -292,11 +292,11 @@ ao_usb_disable_ep(vuint32_t *ep)
 }
 
 static void
-ao_usb_enable_epn(uint8_t n, uint16_t out_bytes, uint8_t **out_addr, uint16_t in_bytes, uint8_t **in_addr)
+ao_usb_enable_epn(uint8_t n, uint16_t out_bytes, uint16_t out_set_bytes, uint8_t **out_addr, uint16_t in_bytes, uint8_t **in_addr)
 {
        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), out_bytes, out_set_bytes);
        if (out_addr)
                *out_addr = addr;
        ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].out[1]);
@@ -359,15 +359,15 @@ ao_usb_set_configuration(void)
        debug ("ao_usb_set_configuration\n");
 
        /* Set up the INT end point */
-       ao_usb_enable_epn(AO_USB_INT_EP, 0, NULL, 0, NULL);
+       ao_usb_enable_epn(AO_USB_INT_EP, 0, 0, NULL, 0, NULL);
 
        /* Set up the OUT end point */
-       ao_usb_enable_epn(AO_USB_OUT_EP, AO_USB_OUT_SIZE * 2, &ao_usb_out_rx_buffer[0], 0, NULL);
+       ao_usb_enable_epn(AO_USB_OUT_EP, AO_USB_OUT_SIZE * 2, AO_USB_OUT_SIZE, &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 * 2, &ao_usb_in_tx_buffer[0]);
+       ao_usb_enable_epn(AO_USB_IN_EP, 0, 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;
 
@@ -771,12 +771,10 @@ ao_usb_putchar(char c)
 
        ao_arch_block_interrupts();
        _ao_usb_in_wait();
-       ao_arch_release_interrupts();
 
        ao_usb_in_flushed = 0;
        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");
@@ -786,6 +784,7 @@ ao_usb_putchar(char c)
        ao_arch_release_interrupts();
 }
 
+#if HAS_AO_USB_WRITE
 void *
 ao_usb_alloc(uint16_t len)
 {
@@ -809,8 +808,6 @@ ao_usb_write(void *block, int len)
                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)
@@ -820,8 +817,11 @@ ao_usb_write(void *block, int len)
                        ao_usb_in_flushed = 1;
                ao_usb_set_ep(ao_usb_epn_in(AO_USB_IN_EP), b, this_time);
                ao_arch_release_interrupts();
+               b += this_time;
+               len -= this_time;
        }
 }
+#endif
 
 static void
 _ao_usb_out_recv(void)
@@ -835,10 +835,10 @@ _ao_usb_out_recv(void)
        debug ("recv %d\n", ao_usb_rx_count);
        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;
+       ao_usb_out_rx_cur = 1 - ao_usb_out_rx_cur;
 
        /* ACK the packet */
-       ao_usb_set_epn_out(AO_USB_OUT_EP, ao_usb_out_rx_buffer[1-ao_usb_rx_out_cur], AO_USB_OUT_SIZE);
+       ao_usb_set_epn_out(AO_USB_OUT_EP, ao_usb_out_rx_buffer[1-ao_usb_out_rx_cur], AO_USB_OUT_SIZE);
 }
 
 int
@@ -863,7 +863,7 @@ _ao_usb_pollchar(void)
        }
 
        /* Pull a character out of the fifo */
-       c = ao_usb_rx_buffer[ao_usb_rx_out_cur][ao_usb_rx_pos++];
+       c = ao_usb_out_rx_buffer[ao_usb_out_rx_cur][ao_usb_rx_pos++];
        return c;
 }
 
@@ -937,7 +937,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);