X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/33a018474913701fa9ef8e962acf58accd1184d2..5d8cdd9bea07acd276b260b34bea299a45a9088a:/Demos/Device/LowLevel/MassStorage/MassStorage.c

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c
index 62c7f21da..ebb8e5c48 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -106,17 +106,23 @@ void EVENT_USB_Disconnect(void)
  */
 void EVENT_USB_ConfigurationChanged(void)
 {
-	/* Setup Mass Storage In and Out Endpoints */
-	Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK,
-		                       ENDPOINT_DIR_IN, MASS_STORAGE_IO_EPSIZE,
-	                           ENDPOINT_BANK_DOUBLE);
-
-	Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK,
-		                       ENDPOINT_DIR_OUT, MASS_STORAGE_IO_EPSIZE,
-	                           ENDPOINT_BANK_DOUBLE);
-
 	/* Indicate USB connected and ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
+
+	/* Setup Mass Storage In and Out Endpoints */
+	if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK,
+		                             ENDPOINT_DIR_IN, MASS_STORAGE_IO_EPSIZE,
+	                                 ENDPOINT_BANK_DOUBLE)))
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+	}
+	
+	if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK,
+		                             ENDPOINT_DIR_OUT, MASS_STORAGE_IO_EPSIZE,
+	                                 ENDPOINT_BANK_DOUBLE)))
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+	}							   
 }
 
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific
@@ -212,9 +218,6 @@ void MassStorage_Task(void)
 					Endpoint_ClearStall();
 					Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
 					Endpoint_ClearStall();
-
-					/* Clear the abort transfer flag */
-					IsMassStoreReset = false;
 				}
 
 				/* Indicate ready */
@@ -226,6 +229,9 @@ void MassStorage_Task(void)
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 			}
 		}
+
+		/* Clear the abort transfer flag */
+		IsMassStoreReset = false;
 	}
 }
 
@@ -248,9 +254,9 @@ static bool ReadInCommandBlock(void)
 	  return false;
 
 	/* Verify the command block - abort if invalid */
-	if ((CommandBlock.Signature != CBW_SIGNATURE) ||
-	    (CommandBlock.LUN >= TOTAL_LUNS) ||
-		(CommandBlock.SCSICommandLength > MAX_SCSI_COMMAND_LENGTH))
+	if ((CommandBlock.Signature         != CBW_SIGNATURE) ||
+	    (CommandBlock.LUN               >= TOTAL_LUNS)    ||
+		(CommandBlock.SCSICommandLength >  MAX_SCSI_COMMAND_LENGTH))
 	{
 		/* Stall both data pipes until reset by host */
 		Endpoint_StallTransaction();