aboutsummaryrefslogtreecommitdiffstats
path: root/Demos
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-06-23 08:45:46 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-06-23 08:45:46 +0000
commitbb23e55f11a42f6214757483d010ebd24377caeb (patch)
treefca0df94ed5d2abf2ef6db0afa13711ca36c9569 /Demos
parenta3a04aa6719a891a1350179d5ac451c3e18c3bf2 (diff)
downloadlufa-bb23e55f11a42f6214757483d010ebd24377caeb.tar.gz
lufa-bb23e55f11a42f6214757483d010ebd24377caeb.tar.bz2
lufa-bb23e55f11a42f6214757483d010ebd24377caeb.zip
Fixed MassStorage demo not clearing the reset flag when a Mass Storage Reset is issued while not processing a command.
Diffstat (limited to 'Demos')
-rw-r--r--Demos/Device/LowLevel/MassStorage/MassStorage.c6
-rw-r--r--Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c
index 3f992c225..f0984a2b3 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -218,9 +218,6 @@ void MassStorage_Task(void)
Endpoint_ClearStall();
Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
Endpoint_ClearStall();
-
- /* Clear the abort transfer flag */
- IsMassStoreReset = false;
}
/* Indicate ready */
@@ -232,6 +229,9 @@ void MassStorage_Task(void)
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
}
+
+ /* Clear the abort transfer flag */
+ IsMassStoreReset = false;
}
}
diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
index c524b5387..b89ad1969 100644
--- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
+++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
@@ -90,6 +90,7 @@ static uint8_t MassStore_SendCommand(void)
/* Send the data in the OUT pipe to the attached device */
Pipe_ClearOUT();
+ /* Wait until command has been sent */
while(!(Pipe_IsOUTReady()));
/* Freeze pipe after use */