diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-08-05 09:37:45 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-08-05 09:37:45 +0000 |
| commit | 0d6c50cee327d21ad784ddfff30133a5176773b9 (patch) | |
| tree | 8779e0f6d9bd2ab4ea83a88e4a532b8daa8d5154 /Demos/Device/LowLevel/MassStorage | |
| parent | 9c27d1086e5e61f82decfb134a32976559592d04 (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@721 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Device/LowLevel/MassStorage')
| -rw-r--r-- | Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c | 28 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MassStorage/MassStorage.h | 2 |
2 files changed, 9 insertions, 21 deletions
diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c index 2bd03c98..9cd0279d 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c +++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c @@ -68,11 +68,8 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo 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)
{
@@ -88,11 +85,8 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo 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 */
@@ -203,11 +197,8 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc 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)
{
@@ -223,11 +214,8 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc 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/LowLevel/MassStorage/MassStorage.h b/Demos/Device/LowLevel/MassStorage/MassStorage.h index 868daf09..65407c8c 100644 --- a/Demos/Device/LowLevel/MassStorage/MassStorage.h +++ b/Demos/Device/LowLevel/MassStorage/MassStorage.h @@ -64,7 +64,7 @@ /** Total number of Logical Units (drives) in the device. The total device capacity is shared equally between
* each drive - this can be set to any positive non-zero amount.
*/
- #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)
|