Some minor whitespace corrections.

[pub/USBasp.git] / Demos / Host / ClassDriver / KeyboardHostWithParser / KeyboardHostWithParser.c

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index 840cb90..620f158 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -36,19 +36,28 @@
  \r
 #include "KeyboardHostWithParser.h"\r
 \r
  \r
 #include "KeyboardHostWithParser.h"\r
 \r

-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       { .Task = USB_Keyboard_Host    , .TaskStatus = TASK_STOP },\r
-};\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
  */\r
 int main(void)\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
  */\r
 int main(void)\r
 {\r

+       SetupHardware();\r
+\r
+       puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
+              "Keyboard HID Parser Host Demo running.\r\n" ESC_INVERSE_OFF));\r
+\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+\r
+       for (;;)\r
+       {\r
+               Keyboard_HID_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


@@ -59,22 +68,7 @@ int main(void)
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
        LEDs_Init();\r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
        LEDs_Init();\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
        USB_Init();\r

-\r
-       /* Start-up message */\r
-       puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
-              "Keyboard Host Demo running.\r\n" ESC_INVERSE_OFF));\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_DeviceAttached event. This indicates that a device has been attached to the host, and\r
 }\r
 \r
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r


@@ -83,10 +77,7 @@ int main(void)
 void EVENT_USB_DeviceAttached(void)\r
 {\r
        puts_P(PSTR("Device Attached.\r\n"));\r
 void EVENT_USB_DeviceAttached(void)\r
 {\r
        puts_P(PSTR("Device Attached.\r\n"));\r

-       UpdateStatus(Status_USBEnumerating);\r
-\r
-       /* Start USB management task to enumerate the device */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r

 }\r
 \r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
 }\r
 \r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r


@@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
  */\r
 void EVENT_USB_DeviceUnattached(void)\r
 {\r
  */\r
 void EVENT_USB_DeviceUnattached(void)\r
 {\r

-       /* Stop keyboard and USB management task */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-       Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_STOP);\r
-\r

        puts_P(PSTR("\r\nDevice Unattached.\r\n"));\r
        puts_P(PSTR("\r\nDevice Unattached.\r\n"));\r

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

 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r


@@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
  */\r
 void EVENT_USB_DeviceEnumerationComplete(void)\r
 {\r
  */\r
 void EVENT_USB_DeviceEnumerationComplete(void)\r
 {\r

-       /* Start Keyboard Host task */\r
-       Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN);\r
-       \r
-       /* Indicate device enumeration complete */\r
-       UpdateStatus(Status_USBReady);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r


@@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
        puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
 \r
        puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
 \r

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

        for(;;);\r
 }\r
 \r
        for(;;);\r
 }\r
 \r


@@ -136,47 +119,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
        printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r
        printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
        \r
        printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r
        printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
        \r

-       UpdateStatus(Status_EnumerationError);\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 KeyboardHostWithParser_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);\r
-                       break;\r
-               case Status_EnumerationError:\r
-               case Status_HardwareError:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED3);\r
-                       break;\r
-               case Status_Busy:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED4);\r
-                       break;\r
-       }\r
-       \r
-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r
  *  the HID report descriptor and HID reports from the device and display the results onto the board LEDs.\r
  */\r
 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r
  *  the HID report descriptor and HID reports from the device and display the results onto the board LEDs.\r
  */\r

-TASK(USB_Keyboard_Host)\r
+void Keyboard_HID_Task(void)\r

 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r


@@ -203,7 +152,7 @@ TASK(USB_Keyboard_Host)
                                printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
 \r
                                /* Indicate error via status LEDs */\r
                                printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
 \r
                                /* Indicate error via status LEDs */\r

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

 \r
                                /* Wait until USB device disconnected */\r
                                while (USB_IsConnected);\r
 \r
                                /* Wait until USB device disconnected */\r
                                while (USB_IsConnected);\r


@@ -226,7 +175,7 @@ TASK(USB_Keyboard_Host)
                                printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
                                \r
                                /* Indicate error via status LEDs */\r
                                printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
                                \r
                                /* Indicate error via status LEDs */\r

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

 \r
                                /* Wait until USB device disconnected */\r
                                while (USB_IsConnected);\r
 \r
                                /* Wait until USB device disconnected */\r
                                while (USB_IsConnected);\r


@@ -235,9 +184,6 @@ TASK(USB_Keyboard_Host)
                                        \r
                        puts_P(PSTR("Processing HID Report.\r\n"));\r
 \r
                                        \r
                        puts_P(PSTR("Processing HID Report.\r\n"));\r
 \r

-                       /* LEDs one and two on to indicate busy processing */\r
-                       UpdateStatus(Status_Busy);\r
-\r

                        /* Get and process the device's first HID report descriptor */\r
                        if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)\r
                        {\r
                        /* Get and process the device's first HID report descriptor */\r
                        if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)\r
                        {\r


@@ -245,15 +191,12 @@ TASK(USB_Keyboard_Host)
                                printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
                        \r
                                /* Indicate error via status LEDs */\r
                                printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
                        \r
                                /* Indicate error via status LEDs */\r

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

                                \r
                                /* Wait until USB device disconnected */\r
                                while (USB_IsConnected);\r
                                break;  \r
                        }\r
                                \r
                                /* Wait until USB device disconnected */\r
                                while (USB_IsConnected);\r
                                break;  \r
                        }\r

-                       \r
-                       /* All LEDs off - ready to indicate key presses */\r
-                       UpdateStatus(Status_USBReady);\r

 \r
                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r
 \r
                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r