From a9d5e129b76449c73a853af450d7d353512cd3a0 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 5 Aug 2009 09:37:45 +0000 Subject: 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. --- .../LowLevel/MassStorage/Lib/DataflashManager.c | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c') diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c index 2bd03c98d..9cd0279d6 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 */ -- cgit v1.2.3