Added start of a port of the core USB driver code to the AVR32 UC3B architecture.

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
index e7f2562..4b1e802 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -45,78 +45,26 @@
  *
  *  This descriptor describes the mouse HID interface's report structure.
  */
  *
  *  This descriptor describes the mouse HID interface's report structure.
  */

-USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =

 {
 {

-       HID_RI_USAGE_PAGE(8),                0x01, /* Generic Desktop */
-       HID_RI_USAGE(8),                     0x02, /* Mouse */
-       HID_RI_COLLECTION(8),                0x01, /* Application */
-           HID_RI_USAGE(8),                 0x01, /* Pointer */
-           HID_RI_COLLECTION(8),            0x00, /* Physical */
-               HID_RI_USAGE_PAGE(8),        0x09, /* Button */
-               HID_RI_USAGE_MINIMUM(8),     0x01,
-               HID_RI_USAGE_MAXIMUM(8),     0x03,
-               HID_RI_LOGICAL_MINIMUM(8),   0,
-               HID_RI_LOGICAL_MAXIMUM(8),   1,
-               HID_RI_REPORT_COUNT(8),      3,
-               HID_RI_REPORT_SIZE(8),       1,
-               HID_RI_INPUT(8),             (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
-
-               HID_RI_REPORT_COUNT(8),      1,
-               HID_RI_REPORT_SIZE(8),       5,
-               HID_RI_INPUT(8),             HID_IOF_CONSTANT,
-
-               HID_RI_USAGE_PAGE(8),        0x01, /* Generic Desktop */
-               HID_RI_USAGE(8),             0x30, /* Usage X */
-               HID_RI_USAGE(8),             0x31, /* Usage Y */
-               HID_RI_LOGICAL_MINIMUM(8),   -1,
-               HID_RI_LOGICAL_MAXIMUM(8),   1,
-               HID_RI_PHYSICAL_MINIMUM(8),  -1,
-               HID_RI_PHYSICAL_MAXIMUM(8),  1,
-               HID_RI_REPORT_COUNT(8),      2,
-               HID_RI_REPORT_SIZE(8),       8,
-               HID_RI_INPUT(8),             (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE | HID_IOF_NON_VOLATILE),
-           HID_RI_END_COLLECTION(0),
-       HID_RI_END_COLLECTION(0),
+       /* Use the HID class driver's standard Mouse report.
+        *   Min X/Y Axis values: -1
+        *   Max X/Y Axis values:  1
+        *   Min physical X/Y Axis values (used to determine resolution): -1
+        *   Max physical X/Y Axis values (used to determine resolution):  1
+        *   Buttons: 3
+        *   Absolute screen coordinates: false
+        */
+       HID_DESCRIPTOR_MOUSE(-1, 1, -1, 1, 3, false)

 };
 
 /** Same as the MouseReport structure, but defines the keyboard HID interface's report structure. */
 };
 
 /** Same as the MouseReport structure, but defines the keyboard HID interface's report structure. */

-USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =

 {
 {

-       HID_RI_USAGE_PAGE(8),                0x01, /* Generic Desktop */
-       HID_RI_USAGE(8),                     0x06, /* Keyboard */
-       HID_RI_COLLECTION(8),                0x01, /* Application */
-           HID_RI_USAGE_PAGE(8),            0x07, /* Key Codes */
-           HID_RI_USAGE_MINIMUM(8),         0xE0, /* Keyboard Left Control */
-           HID_RI_USAGE_MAXIMUM(8),         0xE7, /* Keyboard Right GUI */
-           HID_RI_LOGICAL_MINIMUM(8),       0,
-           HID_RI_LOGICAL_MAXIMUM(8),       1,
-           HID_RI_REPORT_SIZE(8),           1,
-           HID_RI_REPORT_COUNT(8),          8,
-           HID_RI_INPUT(8),                 (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
-
-           HID_RI_REPORT_COUNT(8),          1,
-           HID_RI_REPORT_SIZE(8),           8,
-           HID_RI_INPUT(8),                 HID_IOF_CONSTANT,
-
-           HID_RI_USAGE_PAGE(8),            0x08, /* LEDs */
-           HID_RI_USAGE_MINIMUM(8),         0x01, /* Num Lock */
-           HID_RI_USAGE_MAXIMUM(8),         0x05, /* Kana */
-           HID_RI_REPORT_COUNT(8),          5,
-           HID_RI_REPORT_SIZE(8),           1,
-           HID_RI_OUTPUT(8),                (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
-           HID_RI_REPORT_COUNT(8),          1,
-           HID_RI_REPORT_SIZE(8),           3,
-           HID_RI_OUTPUT(8),                HID_IOF_CONSTANT,
-
-           HID_RI_LOGICAL_MINIMUM(8),       0x00,
-           HID_RI_LOGICAL_MAXIMUM(8),       0x65,
-           HID_RI_USAGE_PAGE(8),            0x07, /* Keyboard */
-           HID_RI_USAGE_MINIMUM(8),         0x00, /* Reserved (no event indicated) */
-           HID_RI_USAGE_MAXIMUM(8),         0x65, /* Keyboard Application */
-           HID_RI_REPORT_COUNT(8),          6,
-           HID_RI_REPORT_SIZE(8),           8,
-           HID_RI_INPUT(8),                 (HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
-       HID_RI_END_COLLECTION(0),
+       /* Use the HID class driver's standard Keyboard report.
+        *   Max simultaneous keys: 6
+        */
+       HID_DESCRIPTOR_KEYBOARD(6)

 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall


@@ -124,7 +72,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
  *  number of device configurations. The descriptor is read out by the USB host when the enumeration
  *  process begins.
  */
  *  number of device configurations. The descriptor is read out by the USB host when the enumeration
  *  process begins.
  */

-USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =

 {
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
 {
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 


@@ -151,7 +99,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
  *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
  *  a configuration so that the host may correctly communicate with the USB device.
  */
  *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
  *  a configuration so that the host may correctly communicate with the USB device.
  */

-USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =

 {
        .Config =
                {
 {
        .Config =
                {


@@ -247,7 +195,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
  *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
  *  via the language ID table available at USB.org what languages the device supports for its string descriptors.
  */
  *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
  *  via the language ID table available at USB.org what languages the device supports for its string descriptors.
  */

-USB_Descriptor_String_t PROGMEM LanguageString =
+const USB_Descriptor_String_t PROGMEM LanguageString =

 {
        .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
 
 {
        .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
 


@@ -258,7 +206,7 @@ USB_Descriptor_String_t PROGMEM LanguageString =
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */

-USB_Descriptor_String_t PROGMEM ManufacturerString =
+const USB_Descriptor_String_t PROGMEM ManufacturerString =

 {
        .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
 
 {
        .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
 


@@ -269,7 +217,7 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */

-USB_Descriptor_String_t PROGMEM ProductString =
+const USB_Descriptor_String_t PROGMEM ProductString =

 {
        .Header                 = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
 
 {
        .Header                 = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
 


@@ -331,6 +279,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                                Address = &ConfigurationDescriptor.HID2_MouseHID;
                                Size    = sizeof(USB_HID_Descriptor_HID_t);
                        }
                                Address = &ConfigurationDescriptor.HID2_MouseHID;
                                Size    = sizeof(USB_HID_Descriptor_HID_t);
                        }

+                       

                        break;
                case HID_DTYPE_Report:
                        if (!(wIndex))
                        break;
                case HID_DTYPE_Report:
                        if (!(wIndex))