projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lpc: Stop sending SETUP IN when the requested size is reached
[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 0f8817207aecdadf7745e74eb1d1f348b9e91496..686dc3a4bd8019d6c2e44251c1bbb10a01f586be 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"
#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
#define USB_DEBUG 0
#define USB_DEBUG_DATA 0
#define USB_ECHO 0
@@
-35,8
+45,6
@@
#define debug_data(format, args...)
#endif
#define debug_data(format, args...)
#endif
-struct ao_task ao_usb_task;
-
struct ao_usb_setup {
uint8_t dir_type_recip;
uint8_t request;
struct ao_usb_setup {
uint8_t dir_type_recip;
uint8_t request;
@@
-50,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 */
/* 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];
/* Temp buffer for smaller EP0 in data */
static uint8_t ao_usb_ep0_in_buf[2];
@@
-81,7
+90,7
@@
static uint8_t ao_usb_tx_count;
static uint8_t ao_usb_rx_buffer[AO_USB_OUT_SIZE];
static uint8_t ao_usb_rx_count, ao_usb_rx_pos;
static uint8_t ao_usb_rx_buffer[AO_USB_OUT_SIZE];
static uint8_t ao_usb_rx_count, ao_usb_rx_pos;
-
static struct lpc_usb_endpoint lpc_usb_endpoint __attribute((aligned(256)))
;
+
extern struct lpc_usb_endpoint lpc_usb_endpoint
;
/* Marks when we don't need to send an IN packet.
* This happens only when the last IN packet is not full,
/* Marks when we don't need to send an IN packet.
* This happens only when the last IN packet is not full,
@@
-308,6
+317,13
@@
ao_usb_disable_epn(uint8_t n)
ao_usb_disable_ep(&lpc_usb_endpoint.epn[n-1].in[1]);
}
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)
{
static void
ao_usb_set_ep0(void)
{
@@
-318,11
+334,8
@@
ao_usb_set_ep0(void)
lpc_usb.epinuse = 0;
lpc_usb.epskip = 0xffffffff;
lpc_usb.epinuse = 0;
lpc_usb.epskip = 0xffffffff;
- ao_usb_set_address(0);
lpc_usb.intstat = 0xc00003ff;
lpc_usb.intstat = 0xc00003ff;
- ao_usb_configuration = 0;
-
ao_usb_sram = lpc_usb_sram;
lpc_usb.epliststart = (uint32_t) (intptr_t) &lpc_usb_endpoint;
ao_usb_sram = lpc_usb_sram;
lpc_usb.epliststart = (uint32_t) (intptr_t) &lpc_usb_endpoint;
@@
-338,7
+351,7
@@
ao_usb_set_ep0(void)
/* Clear all of the other endpoints */
for (e = 1; e <= 4; e++)
ao_usb_disable_epn(e);
/* Clear all of the other endpoints */
for (e = 1; e <= 4; e++)
ao_usb_disable_epn(e);
-
+ ao_usb_reset();
}
static void
}
static void
@@
-368,10
+381,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)
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_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);
debug_data ("Flush EP0 len %d:", this_len);
memcpy(ao_usb_ep0_tx_buffer, ao_usb_ep0_in_data, this_len);
@@
-442,8
+456,9
@@
ao_usb_ep0_out_set(uint8_t *data, uint8_t len)
}
static void
}
static void
-ao_usb_ep0_in_start(uint
8
_t max)
+ao_usb_ep0_in_start(uint
16
_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;
/* Don't send more than asked for */
if (ao_usb_ep0_in_len > max)
ao_usb_ep0_in_len = max;
@@
-582,7
+597,7
@@
ao_usb_ep0_handle(uint8_t receive)
if (receive & AO_USB_EP0_GOT_RESET) {
debug ("\treset\n");
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) {
return;
}
if (receive & AO_USB_EP0_GOT_SETUP) {
@@
-605,8
+620,14
@@
ao_usb_ep0_handle(uint8_t receive)
/* Wait until the IN packet is received from addr 0
* before assigning our local address
*/
/* Wait until the IN packet is received from addr 0
* before assigning our local address
*/
- if (ao_usb_address_pending)
+ if (ao_usb_address_pending) {
+#if HAS_FLIGHT
+ /* Go to idle mode if USB is connected
+ */
+ ao_flight_force_idle = 1;
+#endif
ao_usb_set_address(ao_usb_address);
ao_usb_set_address(ao_usb_address);
+ }
if (ao_usb_ep0_state == AO_USB_EP0_DATA_IN)
ao_usb_ep0_flush();
}
if (ao_usb_ep0_state == AO_USB_EP0_DATA_IN)
ao_usb_ep0_flush();
}
@@
-648,7
+669,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");
_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");
}
_rx_dbg0("stdin awoken");
}
@@
-807,7
+828,7
@@
ao_usb_getchar(void)
ao_arch_block_interrupts();
while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)
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;
}
ao_arch_release_interrupts();
return c;
}
@@
-817,6
+838,9
@@
ao_usb_disable(void)
{
ao_arch_block_interrupts();
{
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;
/* Disable interrupts */
lpc_usb.inten = 0;
@@
-828,8
+852,9
@@
ao_usb_disable(void)
/* Turn off USB clock */
lpc_scb.usbclkdiv = 0;
/* 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) |
/* Disable USB registers and RAM */
lpc_scb.sysahbclkctrl &= ~((1 << LPC_SCB_SYSAHBCLKCTRL_USB) |
@@
-871,7
+896,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.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)))
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)))
@@
-881,6
+905,10
@@
ao_usb_enable(void)
;
lpc_scb.usbclksel = 0;
;
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;
/* Turn on USB clock, use 48MHz clock unchanged */
lpc_scb.usbclkdiv = 1;
@@
-916,6
+944,10
@@
ao_usb_enable(void)
ao_arch_nop();
ao_usb_set_ep0();
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
}
#if USB_ECHO
@@
-951,6
+983,10
@@
__code struct ao_cmds ao_usb_cmds[] = {
void
ao_usb_init(void)
{
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");
ao_usb_enable();
debug ("ao_usb_init\n");
@@
-960,7
+996,7
@@
ao_usb_init(void)
#if USB_DEBUG
ao_cmd_register(&ao_usb_cmds[0]);
#endif
#if USB_DEBUG
ao_cmd_register(&ao_usb_cmds[0]);
#endif
-#if
!USB_ECH
O
+#if
USE_USB_STDI
O
ao_add_stdio(_ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
#endif
}
ao_add_stdio(_ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
#endif
}