diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-02-20 13:23:52 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-02-20 13:23:52 -0700 |
| commit | 104b8bfc9b37fda175f2cb2a1e33601fbf6f48f6 (patch) | |
| tree | 0b47c34e04f4db8bdd509699e9e5b72ed9d6c052 /src/stm/ao_usb_stm.c | |
| parent | 403b95ee27782309b564855b85285c9f5f5c7068 (diff) | |
| parent | 1edf7ef8026ac4ab698a7f99671e9348d18ffd0a (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/stm/ao_usb_stm.c')
| -rw-r--r-- | src/stm/ao_usb_stm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/stm/ao_usb_stm.c b/src/stm/ao_usb_stm.c index 27b82357..4e9d1f14 100644 --- a/src/stm/ao_usb_stm.c +++ b/src/stm/ao_usb_stm.c @@ -117,7 +117,7 @@ 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; #define AO_USB_EP0_GOT_RESET 1 @@ -727,6 +727,9 @@ ao_usb_ep0_handle(uint8_t receive) if (receive & AO_USB_EP0_GOT_TX_ACK) { debug ("\tgot tx ack\n"); +#if HAS_FLIGHT && AO_USB_FORCE_IDLE + ao_flight_force_idle = 1; +#endif /* Wait until the IN packet is received from addr 0 * before assigning our local address */ |