X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7..05fcf7e2a79bebb978d4aeaef26b12f70c6826f8:/Demos/Device/LowLevel/MassStorage/MassStorage.c

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c
index 01d27f043..f9ec4a840 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -37,7 +37,6 @@
 #define  INCLUDE_FROM_MASSSTORAGE_C
 #include "MassStorage.h"
 
-/* Global Variables */
 /** Structure to hold the latest Command Block Wrapper issued by the host, containing a SCSI command to execute. */
 CommandBlockWrapper_t  CommandBlock;
 
@@ -47,8 +46,9 @@ CommandStatusWrapper_t CommandStatus = { .Signature = CSW_SIGNATURE };
 /** Flag to asynchronously abort any in-progress data transfers upon the reception of a mass storage reset command. */
 volatile bool          IsMassStoreReset = false;
 
+
 /** Main program entry point. This routine configures the hardware required by the application, then
- *  starts the scheduler to run the application tasks.
+ *  enters a loop to run the application tasks in sequence.
  */
 int main(void)
 {
@@ -75,7 +75,8 @@ void SetupHardware(void)
 
 	/* Hardware Initialization */
 	LEDs_Init();
-	Dataflash_Init(SPI_SPEED_FCPU_DIV_2);
+	SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
+	Dataflash_Init();
 	USB_Init();
 
 	/* Clear Dataflash sector protections, if enabled */
@@ -83,7 +84,7 @@ void SetupHardware(void)
 }
 
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
 {
 	/* Indicate USB enumerating */
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
@@ -95,7 +96,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
  *  the status LEDs and stops the Mass Storage management task.
  */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
 {
 	/* Indicate USB not ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
@@ -104,7 +105,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
  *  of the USB device after enumeration - the device endpoints are configured and the Mass Storage management task started.
  */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	/* Indicate USB connected and ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
@@ -129,7 +130,7 @@ void EVENT_USB_ConfigurationChanged(void)
  *  control requests that are not handled internally by the USB library (including the Mass Storage class-specific
  *  requests) so that they can be handled appropriately for the application.
  */
-void EVENT_USB_UnhandledControlPacket(void)
+void EVENT_USB_Device_UnhandledControlRequest(void)
 {
 	/* Process UFI specific control requests */
 	switch (USB_ControlRequest.bRequest)
@@ -140,7 +141,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 				Endpoint_ClearSETUP();
 
 				/* Indicate that the current transfer should be aborted */
-				IsMassStoreReset = true;			
+				IsMassStoreReset = true;
 
 				Endpoint_ClearStatusStage();
 			}
@@ -188,34 +189,21 @@ void MassStorage_Task(void)
 			if (CommandBlock.Flags & COMMAND_DIRECTION_DATA_IN)
 			  Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
 
-			/* Decode the received SCSI command */
-			SCSI_DecodeSCSICommand();
+			/* Decode the received SCSI command, set returned status code */
+			CommandStatus.Status = SCSI_DecodeSCSICommand() ? Command_Pass : Command_Fail;		
 
 			/* Load in the CBW tag into the CSW to link them together */
 			CommandStatus.Tag = CommandBlock.Tag;
 
 			/* Load in the data residue counter into the CSW */
 			CommandStatus.DataTransferResidue = CommandBlock.DataTransferLength;
-
+			
 			/* Stall the selected data pipe if command failed (if data is still to be transferred) */
 			if ((CommandStatus.Status == Command_Fail) && (CommandStatus.DataTransferResidue))
 			  Endpoint_StallTransaction();
 
 			/* Return command status block to the host */
 			ReturnCommandStatus();
-			
-			/* Check if a Mass Storage Reset occurred */
-			if (IsMassStoreReset)
-			{
-				/* Reset the data endpoint banks */
-				Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);
-				Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);
-				
-				Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
-				Endpoint_ClearStall();
-				Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
-				Endpoint_ClearStall();
-			}
 
 			/* Indicate ready */
 			LEDs_SetAllLEDs(LEDMASK_USB_READY);
@@ -227,8 +215,23 @@ void MassStorage_Task(void)
 		}
 	}
 
-	/* Clear the abort transfer flag */
-	IsMassStoreReset = false;
+	/* Check if a Mass Storage Reset occurred */
+	if (IsMassStoreReset)
+	{
+		/* Reset the data endpoint banks */
+		Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);
+		Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);
+		
+		Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
+		Endpoint_ClearStall();
+		Endpoint_ResetDataToggle();
+		Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
+		Endpoint_ClearStall();
+		Endpoint_ResetDataToggle();
+
+		/* Clear the abort transfer flag */
+		IsMassStoreReset = false;
+	}
 }
 
 /** Function to read in a command block from the host, via the bulk data OUT endpoint. This function reads in the next command block