diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-05 09:37:45 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-05 09:37:45 +0000 |
| commit | a9d5e129b76449c73a853af450d7d353512cd3a0 (patch) | |
| tree | 8779e0f6d9bd2ab4ea83a88e4a532b8daa8d5154 /Demos/Device/ClassDriver/MassStorage | |
| parent | 4b35dd167001233d2f44f918d3656a3f2ad80f2e (diff) | |
| download | lufa-a9d5e129b76449c73a853af450d7d353512cd3a0.tar.gz lufa-a9d5e129b76449c73a853af450d7d353512cd3a0.tar.bz2 lufa-a9d5e129b76449c73a853af450d7d353512cd3a0.zip | |
Changed over manual loops waiting for endpoints to be ready to use the library Endpoint_WaitUntilReady() function for robustness. Fixes issues with terminated transfers on the host locking up USB devices.
Diffstat (limited to 'Demos/Device/ClassDriver/MassStorage')
| -rw-r--r-- | Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c | 28 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/MassStorage/MassStorage.h | 2 |
2 files changed, 9 insertions, 21 deletions
diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c index 5f12d02b4..3858d3873 100644 --- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c +++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c @@ -69,11 +69,8 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co Dataflash_SendAddressBytes(0, CurrDFPageByte);
/* Wait until endpoint is ready before continuing */
- while (!(Endpoint_IsReadWriteAllowed()))
- {
- if (USB_DeviceState == DEVICE_STATE_Unattached)
- return;
- }
+ if (Endpoint_WaitUntilReady())
+ return;
while (TotalBlocks)
{
@@ -89,11 +86,8 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co Endpoint_ClearOUT();
/* Wait until the host has sent another packet */
- while (!(Endpoint_IsReadWriteAllowed()))
- {
- if (USB_DeviceState == DEVICE_STATE_Unattached)
- return;
- }
+ if (Endpoint_WaitUntilReady())
+ return;
}
/* Check if end of dataflash page reached */
@@ -205,11 +199,8 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con Dataflash_SendByte(0x00);
/* Wait until endpoint is ready before continuing */
- while (!(Endpoint_IsReadWriteAllowed()))
- {
- if (USB_DeviceState == DEVICE_STATE_Unattached)
- return;
- }
+ if (Endpoint_WaitUntilReady())
+ return;
while (TotalBlocks)
{
@@ -225,11 +216,8 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con Endpoint_ClearIN();
/* Wait until the endpoint is ready for more data */
- while (!(Endpoint_IsReadWriteAllowed()))
- {
- if (USB_DeviceState == DEVICE_STATE_Unattached)
- return;
- }
+ if (Endpoint_WaitUntilReady())
+ return;
}
/* Check if end of dataflash page reached */
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.h b/Demos/Device/ClassDriver/MassStorage/MassStorage.h index e6b2bf99f..930e8f4cb 100644 --- a/Demos/Device/ClassDriver/MassStorage/MassStorage.h +++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.h @@ -70,7 +70,7 @@ #define LEDMASK_USB_BUSY (LEDS_LED2)
/** Total number of logical drives within the device - must be non-zero. */
- #define TOTAL_LUNS 2
+ #define TOTAL_LUNS 1
/** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */
#define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS)
|