Synchronise with the 090605 release.

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

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.h b/Demos/Device/KeyboardMouse/KeyboardMouse.h
index a5c3c5d..74b1c9e 100644 (file)
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.h
@@ -49,9 +49,16 @@
                #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
 \r
        /* Macros: */\r
                #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
 \r
        /* Macros: */\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
                #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
                #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
                #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
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
                \r
        /* Type Defines: */\r


@@ -82,10 +89,9 @@
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_UnhandledControlPacket(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

-               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
+               uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData);\r
+               void     CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID, \r

                                                                   void* ReportData, uint16_t ReportSize);\r
                \r
 #endif\r
                                                                   void* ReportData, uint16_t ReportSize);\r
                \r
 #endif\r