Converted device mode low-level demos to schedulerless.

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

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.h b/Demos/Device/LowLevel/MassStorage/MassStorage.h
index cbd3cd9..81fba00 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.h
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.h
@@ -46,11 +46,10 @@
                #include "Lib/SCSI.h"\r
                #include "Lib/DataflashManager.h"\r
 \r
-               #include <LUFA/Version.h>                    // Library Version Information\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
-               #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
-               #include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver\r
-               #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Board/Dataflash.h>\r
 \r
        /* Macros: */\r
                /** Mass Storage Class specific request to reset the Mass Storage interface, ready for the next command. */\r
@@ -82,6 +81,21 @@
                /** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from device-to-host. */\r
                #define COMMAND_DIRECTION_DATA_IN  (1 << 7)\r
 \r
+               /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+\r
+               /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
+               #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
+               \r
        /* Type defines: */\r
                /** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
                typedef struct\r
@@ -112,33 +126,21 @@
                        Command_Fail = 1, /**< Command failed to complete - host may check the exact error via a SCSI REQUEST SENSE command */\r
                        Phase_Error  = 2  /**< Command failed due to being invalid in the current phase */\r
                };\r
-\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum MassStorage_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady            = 0, /**< USB is not ready (disconnected from a USB host) */\r
-                       Status_USBEnumerating         = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady               = 2, /**< USB interface is connected and ready */\r
-                       Status_CommandBlockError      = 3, /**< Processing a SCSI command block from the host */\r
-                       Status_ProcessingCommandBlock = 4, /**< Error during the processing of a SCSI command block from the host */\r
-               };\r
                \r
        /* Global Variables: */\r
                extern CommandBlockWrapper_t  CommandBlock;\r
                extern CommandStatusWrapper_t CommandStatus;\r
                extern volatile bool          IsMassStoreReset;\r
-\r
-       /* Task Definitions: */\r
-               TASK(USB_MassStorage);\r
                \r
        /* Function Prototypes: */\r
+               void SetupHardware(void);\r
+               void MassStorage_Task(void);\r
+       \r
                void EVENT_USB_Connect(void);\r
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_UnhandledControlPacket(void);\r
 \r
-               void UpdateStatus(uint8_t CurrentStatus);\r
-\r
                #if defined(INCLUDE_FROM_MASSSTORAGE_C)\r
                        static bool ReadInCommandBlock(void);\r
                        static void ReturnCommandStatus(void);\r