X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b462f2d457ec2f0cfa22a1c3db198cb22f6809a1..a7ade9f28dac6b42e2a85823ec80d5539c176667:/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 fdc91dd5d..9cd0279d6 100644
--- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c
+++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c
@@ -68,8 +68,9 @@ 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 (Endpoint_WaitUntilReady())
+	  return;
+	
 	while (TotalBlocks)
 	{
 		uint8_t BytesInBlockDiv16 = 0;
@@ -84,7 +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 (Endpoint_WaitUntilReady())
+				  return;
 			}
 
 			/* Check if end of dataflash page reached */
@@ -195,7 +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 (Endpoint_WaitUntilReady())
+	  return;
 	
 	while (TotalBlocks)
 	{
@@ -211,7 +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 (Endpoint_WaitUntilReady())
+				  return;
 			}
 			
 			/* Check if end of dataflash page reached */