Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / Demos / Device / ClassDriver / KeyboardMouse / Descriptors.c

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
index b299b71..2818b6e 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -1,22 +1,22 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-  Copyright 2009  Denver Gingerich (denver [at] ossguy [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)\r
   \r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -162,7 +162,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
-       .KeyboardInterface = \r
+       .HID1_KeyboardInterface = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -173,12 +173,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                \r
                        .Class                  = 0x03,\r
                        .SubClass               = 0x01,\r
-                       .Protocol               = 0x01,\r
+                       .Protocol               = HID_BOOT_KEYBOARD_PROTOCOL,\r
                                \r
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
-       .KeyboardHID = \r
+       .HID1_KeyboardHID = \r
                {  \r
                        .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
                        \r
@@ -189,17 +189,17 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
                \r
-       .KeyboardInEndpoint = \r
+       .HID1_ReportINEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_IN_EPNUM),\r
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = HID_EPSIZE,\r
-                       .PollingIntervalMS      = 0x02\r
+                       .PollingIntervalMS      = 0x0A\r
                },\r
 \r
-       .MouseInterface = \r
+       .HID2_MouseInterface = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -210,12 +210,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                \r
                        .Class                  = 0x03,\r
                        .SubClass               = 0x01,\r
-                       .Protocol               = 0x02,\r
+                       .Protocol               = HID_BOOT_MOUSE_PROTOCOL,\r
                                \r
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
-       .MouseHID = \r
+       .HID2_MouseHID = \r
                {  \r
                        .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
                        \r
@@ -226,14 +226,14 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .HIDReportLength        = sizeof(MouseReport)\r
                },\r
                \r
-       .MouseInEndpoint = \r
+       .HID2_ReportINEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MOUSE_IN_EPNUM),\r
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = HID_EPSIZE,\r
-                       .PollingIntervalMS      = 0x02\r
+                       .PollingIntervalMS      = 0x0A\r
                }\r
 };\r
 \r
@@ -315,12 +315,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                case DTYPE_HID: \r
                        if (!(wIndex))\r
                        {\r
-                               Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+                               Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;\r
                                Size    = sizeof(USB_HID_Descriptor_t);\r
                        }\r
                        else\r
                        {\r
-                               Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+                               Address = (void*)&ConfigurationDescriptor.HID2_MouseHID;\r
                                Size    = sizeof(USB_HID_Descriptor_t);                 \r
                        }\r
                        break;\r