aboutsummaryrefslogtreecommitdiff
path: root/Demos/Device/ClassDriver/MassStorage/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Demos/Device/ClassDriver/MassStorage/Lib')
-rw-r--r--Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c
index 5f12d02b43..3858d38732 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 */