aboutsummaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-12-08 07:43:33 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-12-08 07:43:33 +0000
commit2281750b5fdf046ed606e567eb60cf4e647015dd (patch)
tree74b5011a55f12a768f4232fdc771937d8e124e02 /Projects
parent3757b1760fdd197a8c7227bbfd0b11ee33eb99e6 (diff)
downloadlufa-2281750b5fdf046ed606e567eb60cf4e647015dd.tar.gz
lufa-2281750b5fdf046ed606e567eb60cf4e647015dd.tar.bz2
lufa-2281750b5fdf046ed606e567eb60cf4e647015dd.zip
Make sure that USB_STREAM_TIMEOUT_MS is set in the MassStorageHost ClassDriver demo, so that slow devices don't time out the data pipe. Increase pipe timeout in both MassStorageHost demos to 5 seconds to account for the really slow devices.
Fix TeensyHID bootloader not properly shutting down the USB interface to trigger a disconnection on the host before resetting the AVR.
Diffstat (limited to 'Projects')
-rw-r--r--Projects/AVRISP/Lib/PDIProtocol.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 93634a022..d98c51c43 100644
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -109,7 +109,10 @@ static void PDIProtocol_EnterXPROGMode(void)
/* Must hold DATA line high for at least 90nS to enable PDI interface */
PDIDATA_LINE_PORT |= PDIDATA_LINE_MASK;
- _delay_us(1);
+ asm volatile ("NOP"::);
+ #if (F_CPU > 8000000)
+ asm volatile ("NOP"::);
+ #endif
/* Toggle CLOCK line 16 times within 100uS of the original 90nS timeout to keep PDI interface enabled */
for (uint8_t i = 0; i < 16; i++)