Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / Demos / Device / LowLevel / MassStorage / MassStorage.c

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c
index 1a2d8d4..cb43b19 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -37,7 +37,6 @@
 #define  INCLUDE_FROM_MASSSTORAGE_C\r
 #include "MassStorage.h"\r
 \r
-/* Global Variables */\r
 /** Structure to hold the latest Command Block Wrapper issued by the host, containing a SCSI command to execute. */\r
 CommandBlockWrapper_t  CommandBlock;\r
 \r
@@ -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. */\r
 volatile bool          IsMassStoreReset = false;\r
 \r
+\r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
- *  starts the scheduler to run the application tasks.\r
+ *  enters a loop to run the application tasks in sequence.\r
  */\r
 int main(void)\r
 {\r
@@ -75,7 +75,8 @@ void SetupHardware(void)
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r
-       Dataflash_Init(SPI_SPEED_FCPU_DIV_2);\r
+       SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);\r
+       Dataflash_Init();\r
        USB_Init();\r
 \r
        /* Clear Dataflash sector protections, if enabled */\r
@@ -140,7 +141,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
 \r
                                /* Indicate that the current transfer should be aborted */\r
-                               IsMassStoreReset = true;                        \r
+                               IsMassStoreReset = true;\r
 \r
                                Endpoint_ClearStatusStage();\r
                        }\r
@@ -188,34 +189,21 @@ void MassStorage_Task(void)
                        if (CommandBlock.Flags & COMMAND_DIRECTION_DATA_IN)\r
                          Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);\r
 \r
-                       /* Decode the received SCSI command */\r
-                       SCSI_DecodeSCSICommand();\r
+                       /* Decode the received SCSI command, set returned status code */\r
+                       CommandStatus.Status = SCSI_DecodeSCSICommand() ? Command_Pass : Command_Fail;          \r
 \r
                        /* Load in the CBW tag into the CSW to link them together */\r
                        CommandStatus.Tag = CommandBlock.Tag;\r
 \r
                        /* Load in the data residue counter into the CSW */\r
                        CommandStatus.DataTransferResidue = CommandBlock.DataTransferLength;\r
-\r
+                       \r
                        /* Stall the selected data pipe if command failed (if data is still to be transferred) */\r
                        if ((CommandStatus.Status == Command_Fail) && (CommandStatus.DataTransferResidue))\r
                          Endpoint_StallTransaction();\r
 \r
                        /* Return command status block to the host */\r
                        ReturnCommandStatus();\r
-                       \r
-                       /* Check if a Mass Storage Reset occurred */\r
-                       if (IsMassStoreReset)\r
-                       {\r
-                               /* Reset the data endpoint banks */\r
-                               Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);\r
-                               Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);\r
-                               \r
-                               Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);\r
-                               Endpoint_ClearStall();\r
-                               Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);\r
-                               Endpoint_ClearStall();\r
-                       }\r
 \r
                        /* Indicate ready */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
@@ -227,8 +215,23 @@ void MassStorage_Task(void)
                }\r
        }\r
 \r
-       /* Clear the abort transfer flag */\r
-       IsMassStoreReset = false;\r
+       /* Check if a Mass Storage Reset occurred */\r
+       if (IsMassStoreReset)\r
+       {\r
+               /* Reset the data endpoint banks */\r
+               Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);\r
+               Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);\r
+               \r
+               Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);\r
+               Endpoint_ClearStall();\r
+               Endpoint_ResetDataToggle();\r
+               Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);\r
+               Endpoint_ClearStall();\r
+               Endpoint_ResetDataToggle();\r
+\r
+               /* Clear the abort transfer flag */\r
+               IsMassStoreReset = false;\r
+       }\r
 }\r
 \r
 /** Function to read in a command block from the host, via the bulk data OUT endpoint. This function reads in the next command block\r