X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ccf5bd19f2d750440043b242cf26fcda09b69cce..34f6e0dd33230441b8a91130467b3164e343853e:/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c

diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
index 95aafca8c..afeace02f 100644
--- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
+++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
@@ -107,10 +107,6 @@ static uint8_t MassStore_WaitForDataReceived(void)
 {
 	uint16_t TimeoutMSRem = COMMAND_DATA_TIMEOUT_MS;
 
-	/* Unfreeze the OUT pipe so that it can be checked */
-	Pipe_SelectPipe(MASS_STORE_DATA_OUT_PIPE);
-	Pipe_Unfreeze();
-
 	/* Select the IN data pipe for data reception */
 	Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE);
 	Pipe_Unfreeze();
@@ -130,7 +126,9 @@ static uint8_t MassStore_WaitForDataReceived(void)
 			  return PIPE_RWSTREAM_Timeout;
 		}
 	
+		Pipe_Freeze();
 		Pipe_SelectPipe(MASS_STORE_DATA_OUT_PIPE);
+		Pipe_Unfreeze();
 
 		/* Check if pipe stalled (command failed by device) */
 		if (Pipe_IsStalled())
@@ -140,8 +138,10 @@ static uint8_t MassStore_WaitForDataReceived(void)
 
 			return PIPE_RWSTREAM_PipeStalled;
 		}
-
+		
+		Pipe_Freeze();
 		Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE);
+		Pipe_Unfreeze();
 
 		/* Check if pipe stalled (command failed by device) */
 		if (Pipe_IsStalled())
@@ -156,6 +156,12 @@ static uint8_t MassStore_WaitForDataReceived(void)
 		if (!(USB_IsConnected))
 		  return PIPE_RWSTREAM_DeviceDisconnected;
 	};
+	
+	Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE);
+	Pipe_Freeze();
+		
+	Pipe_SelectPipe(MASS_STORE_DATA_OUT_PIPE);
+	Pipe_Freeze();
 
 	return PIPE_RWSTREAM_NoError;
 }