Finished basic documentation of all device mode class drivers.

[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 72a2302..ee2a9d7 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -37,12 +37,6 @@
 #define  INCLUDE_FROM_MASSSTORAGE_C\r
 #include "MassStorage.h"\r
 \r
 #define  INCLUDE_FROM_MASSSTORAGE_C\r
 #include "MassStorage.h"\r
 \r

-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_MassStorage      , .TaskStatus = TASK_STOP },\r
-};\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
 /* 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


@@ -58,6 +52,20 @@ volatile bool          IsMassStoreReset = false;
  */\r
 int main(void)\r
 {\r
  */\r
 int main(void)\r
 {\r

+       SetupHardware();\r
+       \r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+\r
+       for (;;)\r
+       {\r
+               MassStorage_Task();\r
+               USB_USBTask();\r
+       }\r
+}\r
+\r
+/** Configures the board hardware and chip peripherals for the demo's functionality. */\r
+void SetupHardware(void)\r
+{\r

        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r


@@ -68,28 +76,17 @@ int main(void)
        /* Hardware Initialization */\r
        LEDs_Init();\r
        Dataflash_Init(SPI_SPEED_FCPU_DIV_2);\r
        /* Hardware Initialization */\r
        LEDs_Init();\r
        Dataflash_Init(SPI_SPEED_FCPU_DIV_2);\r

+       USB_Init();\r

 \r
        /* Clear Dataflash sector protections, if enabled */\r
        DataflashManager_ResetDataflashProtections();\r
 \r
        /* Clear Dataflash sector protections, if enabled */\r
        DataflashManager_ResetDataflashProtections();\r

-       \r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-       \r
-       /* Initialize Scheduler so that it can be used */\r
-       Scheduler_Init();\r
-\r
-       /* Initialize USB Subsystem */\r
-       USB_Init();\r
-\r
-       /* Scheduling - routine never returns, so put this last in the main function */\r
-       Scheduler_Start();\r

 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */\r
 void EVENT_USB_Connect(void)\r
 {\r
        /* Indicate USB enumerating */\r
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */\r
 void EVENT_USB_Connect(void)\r
 {\r
        /* Indicate USB enumerating */\r

-       UpdateStatus(Status_USBEnumerating);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r

        \r
        /* Reset the MSReset flag upon connection */\r
        IsMassStoreReset = false;\r
        \r
        /* Reset the MSReset flag upon connection */\r
        IsMassStoreReset = false;\r


@@ -100,11 +97,8 @@ void EVENT_USB_Connect(void)
  */\r
 void EVENT_USB_Disconnect(void)\r
 {\r
  */\r
 void EVENT_USB_Disconnect(void)\r
 {\r

-       /* Stop running mass storage task */\r
-       Scheduler_SetTaskMode(USB_MassStorage, TASK_STOP);\r
-\r

        /* Indicate USB not ready */\r
        /* Indicate USB not ready */\r

-       UpdateStatus(Status_USBNotReady);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r

 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r


@@ -112,20 +106,23 @@ void EVENT_USB_Disconnect(void)
  */\r
 void EVENT_USB_ConfigurationChanged(void)\r
 {\r
  */\r
 void EVENT_USB_ConfigurationChanged(void)\r
 {\r

+       /* Indicate USB connected and ready */\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
+\r

        /* Setup Mass Storage In and Out Endpoints */\r
        /* Setup Mass Storage In and Out Endpoints */\r

-       Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK,\r
+       if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK,\r

                                       ENDPOINT_DIR_IN, MASS_STORAGE_IO_EPSIZE,\r
                                       ENDPOINT_DIR_IN, MASS_STORAGE_IO_EPSIZE,\r

-                                  ENDPOINT_BANK_DOUBLE);\r
-\r
-       Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_OUT, MASS_STORAGE_IO_EPSIZE,\r
-                                  ENDPOINT_BANK_DOUBLE);\r
-\r
-       /* Indicate USB connected and ready */\r
-       UpdateStatus(Status_USBReady);\r
+                                  ENDPOINT_BANK_DOUBLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r

        \r
        \r

-       /* Start mass storage task */\r
-       Scheduler_SetTaskMode(USB_MassStorage, TASK_RUN);\r
+       if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK,\r
+                                      ENDPOINT_DIR_OUT, MASS_STORAGE_IO_EPSIZE,\r
+                                  ENDPOINT_BANK_DOUBLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }                                                          \r

 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r


@@ -170,43 +167,10 @@ void EVENT_USB_UnhandledControlPacket(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
- *  log to a serial port, or anything else that is suitable for status updates.\r
- *\r
- *  \param CurrentStatus  Current status of the system, from the MassStorage_StatusCodes_t enum\r
- */\r
-void UpdateStatus(uint8_t CurrentStatus)\r
-{\r
-       uint8_t LEDMask = LEDS_NO_LEDS;\r
-       \r
-       /* Set the LED mask to the appropriate LED mask based on the given status code */\r
-       switch (CurrentStatus)\r
-       {\r
-               case Status_USBNotReady:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_USBEnumerating:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-               case Status_USBReady:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED4);\r
-                       break;\r
-               case Status_CommandBlockError:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_ProcessingCommandBlock:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-       }\r
-       \r
-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
-}\r
-\r

 /** Task to manage the Mass Storage interface, reading in Command Block Wrappers from the host, processing the SCSI commands they\r
  *  contain, and returning Command Status Wrappers back to the host to indicate the success or failure of the last issued command.\r
  */\r
 /** Task to manage the Mass Storage interface, reading in Command Block Wrappers from the host, processing the SCSI commands they\r
  *  contain, and returning Command Status Wrappers back to the host to indicate the success or failure of the last issued command.\r
  */\r

-TASK(USB_MassStorage)\r
+void MassStorage_Task(void)\r

 {\r
        /* Check if the USB System is connected to a Host */\r
        if (USB_IsConnected)\r
 {\r
        /* Check if the USB System is connected to a Host */\r
        if (USB_IsConnected)\r


@@ -216,9 +180,9 @@ TASK(USB_MassStorage)
                \r
                /* Check to see if a command from the host has been issued */\r
                if (Endpoint_IsReadWriteAllowed())\r
                \r
                /* Check to see if a command from the host has been issued */\r
                if (Endpoint_IsReadWriteAllowed())\r

-               {       \r
+               {\r

                        /* Indicate busy */\r
                        /* Indicate busy */\r

-                       UpdateStatus(Status_ProcessingCommandBlock);\r
+                       LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r

 \r
                        /* Process sent command block from the host */\r
                        if (ReadInCommandBlock())\r
 \r
                        /* Process sent command block from the host */\r
                        if (ReadInCommandBlock())\r


@@ -260,12 +224,12 @@ TASK(USB_MassStorage)
                                }\r
 \r
                                /* Indicate ready */\r
                                }\r
 \r
                                /* Indicate ready */\r

-                               UpdateStatus(Status_USBReady);\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

                        }\r
                        else\r
                        {\r
                                /* Indicate error reading in the command block from the host */\r
                        }\r
                        else\r
                        {\r
                                /* Indicate error reading in the command block from the host */\r

-                               UpdateStatus(Status_CommandBlockError);\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r