Commit of new class abstraction APIs for all device demos other than the MIDI demo...

[pub/USBasp.git] / Demos / Device / Keyboard / Keyboard.h

diff --git a/Demos/Device/Keyboard/Keyboard.h b/Demos/Device/Keyboard/Keyboard.h
index c4ed6e0..eeb7be9 100644 (file)
--- a/Demos/Device/Keyboard/Keyboard.h
+++ b/Demos/Device/Keyboard/Keyboard.h
@@ -47,36 +47,12 @@
 \r
                #include "Descriptors.h"\r
 \r
 \r
                #include "Descriptors.h"\r
 \r

-               #include <LUFA/Version.h>                    // Library Version Information\r
-               #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
-               #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
-\r
-       /* Macros: */\r
-               /** Idle period indicating that reports should be sent only when the inputs have changed */\r
-               #define HID_IDLE_CHANGESONLY   0\r
-\r
-               /** HID Class specific request to get the next HID report from the device. */\r
-               #define REQ_GetReport          0x01\r
-\r
-               /** HID Class specific request to get the idle timeout period of the device. */\r
-               #define REQ_GetIdle            0x02\r
-\r
-               /** HID Class specific request to send the next HID report to the device. */\r
-               #define REQ_SetReport          0x09\r
-\r
-               /** HID Class specific request to set the idle timeout period of the device. */\r
-               #define REQ_SetIdle            0x0A\r
-\r
-               /** HID Class specific request to get the current HID protocol in use, either report or boot. */\r
-               #define REQ_GetProtocol        0x03\r
-\r
-               /** HID Class specific request to set the current HID protocol in use, either report or boot. */\r
-               #define REQ_SetProtocol        0x0B\r
-               \r
-       /* Task Definitions: */\r
-               TASK(USB_Keyboard_Report);\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Board/Joystick.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Board/Buttons.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r

 \r
        /* Type Defines: */\r
                /** Type define for the keyboard HID report structure, for creating and sending HID reports to the host PC.\r
 \r
        /* Type Defines: */\r
                /** Type define for the keyboard HID report structure, for creating and sending HID reports to the host PC.\r


@@ -89,25 +65,23 @@
                        uint8_t KeyCode[6]; /**< Array of up to six simultaneous key codes of pressed keys */\r
                } USB_KeyboardReport_Data_t;\r
                        \r
                        uint8_t KeyCode[6]; /**< Array of up to six simultaneous key codes of pressed keys */\r
                } USB_KeyboardReport_Data_t;\r
                        \r

-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum Keyboard_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
-               };\r
+       /* Macros: */\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

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

+               void SetupHardware(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
                void EVENT_USB_Connect(void);\r
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_UnhandledControlPacket(void);\r

+               void EVENT_USB_StartOfFrame(void);\r

 \r
 \r

-               void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData);\r
-               void ProcessLEDReport(uint8_t LEDReport);\r
-               void SendNextReport(void);\r
-               void ReceiveNextReport(void);\r
-               void UpdateStatus(uint8_t CurrentStatus);\r
+               uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);\r
+               void     CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,\r
+                                                                  void* ReportData, uint16_t ReportSize);\r

 \r
 #endif\r
 \r
 #endif\r