Converted Host mode demos to schedulerless. Fixed host mode broken due to earlier...

[pub/USBasp.git] / Demos / Host / LowLevel / KeyboardHost / KeyboardHost.h

diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h
index d00b76a..4aa09e1 100644 (file)
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h
@@ -44,12 +44,11 @@
                #include <avr/interrupt.h>\r
                #include <stdio.h>\r
 \r
                #include <avr/interrupt.h>\r
                #include <stdio.h>\r
 \r

-               #include <LUFA/Version.h>                                // Library Version Information\r
-               #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
-               #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
-               #include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>                     // LEDs driver\r
-               #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Misc/TerminalCodes.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r

                \r
                #include "ConfigDescriptor.h"\r
                \r
                \r
                #include "ConfigDescriptor.h"\r
                \r


@@ -60,6 +59,18 @@
                /** HID Class Specific request to set the report protocol mode */\r
                #define REQ_SetProtocol             0x0B\r
 \r
                /** HID Class Specific request to set the report protocol mode */\r
                #define REQ_SetProtocol             0x0B\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

        /* Type Defines: */\r
                /** Type define for a standard Boot Protocol Keyboard report */\r
                typedef struct\r
        /* Type Defines: */\r
                /** Type define for a standard Boot Protocol Keyboard report */\r
                typedef struct\r


@@ -69,28 +80,15 @@
                        uint8_t KeyCode; /**< Key code of the currently pressed key */\r
                } USB_KeyboardReport_Data_t;\r
 \r
                        uint8_t KeyCode; /**< Key code of the currently pressed key */\r
                } USB_KeyboardReport_Data_t;\r
 \r

-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum KeyboardHost_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady      = 0, /**< USB is not ready (disconnected from a USB device) */\r
-                       Status_USBEnumerating   = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady         = 2, /**< USB interface is connected and ready */\r
-                       Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */\r
-                       Status_HardwareError    = 4, /**< Hardware error while enumerating the attached USB device */\r
-               };\r
-       \r
-       /* Task Definitions: */\r
-               TASK(USB_Keyboard_Host);\r
-\r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

+               void Keyboard_HID_Task(void);\r
+       \r

                void EVENT_USB_HostError(const uint8_t ErrorCode);\r
                void EVENT_USB_DeviceAttached(void);\r
                void EVENT_USB_DeviceUnattached(void);\r
                void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
                void EVENT_USB_DeviceEnumerationComplete(void);\r
 \r
                void EVENT_USB_HostError(const uint8_t ErrorCode);\r
                void EVENT_USB_DeviceAttached(void);\r
                void EVENT_USB_DeviceUnattached(void);\r
                void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
                void EVENT_USB_DeviceEnumerationComplete(void);\r
 \r

-               void UpdateStatus(uint8_t CurrentStatus);\r

                void ReadNextReport(void);\r
                \r
 #endif\r
                void ReadNextReport(void);\r
                \r
 #endif\r