Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Device / LowLevel / GenericHID / Descriptors.c

diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.c b/Demos/Device/LowLevel/GenericHID/Descriptors.c
index 79cecb5..abc9e80 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/Descriptors.c
+++ b/Demos/Device/LowLevel/GenericHID/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -43,24 +43,24 @@
  *  the device will send, and what it may be sent back from the host. Refer to the HID specification for
  *  more details on HID report descriptors.
  */
-USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
 {
-       0x06, 0x9c, 0xff,     /* Usage Page (Vendor Defined)                     */
-       0x09, 0x01,           /* Usage (Vendor Defined)                          */
-       0xa1, 0x01,           /* Collection (Vendor Defined)                     */
-       0x09, 0x02,           /*   Usage (Vendor Defined)                        */
-       0x75, 0x08,           /*   Report Size (8)                               */
-       0x95, GENERIC_REPORT_SIZE, /*   Report Count (GENERIC_REPORT_SIZE)       */
-       0x15, 0x00,           /*   Logical Minimum (0)                           */
-       0x25, 0xff,           /*   Logical Maximum (255)                         */
-       0x81, 0x02,           /*   Input (Data, Variable, Absolute)              */
-       0x09, 0x03,           /*   Usage (Vendor Defined)                        */
-       0x75, 0x08,           /*   Report Size (8)                               */
-       0x95, GENERIC_REPORT_SIZE, /*   Report Count (GENERIC_REPORT_SIZE)       */
-       0x15, 0x00,           /*   Logical Minimum (0)                           */
-       0x25, 0xff,           /*   Logical Maximum (255)                         */
-       0x91, 0x02,           /*   Output (Data, Variable, Absolute)             */
-       0xc0                  /* End Collection                                  */
+       HID_RI_USAGE_PAGE(16, 0xFF00), /* Vendor Page 1 */
+       HID_RI_USAGE(8, 0x01), /* Vendor Usage 1 */
+       HID_RI_COLLECTION(8, 0x01), /* Vendor Usage 1 */
+           HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */
+           HID_RI_LOGICAL_MINIMUM(8, 0x00),
+           HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+           HID_RI_REPORT_SIZE(8, 0x08),
+           HID_RI_REPORT_COUNT(8, GENERIC_REPORT_SIZE),
+           HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+           HID_RI_USAGE(8, 0x03), /* Vendor Usage 3 */
+           HID_RI_LOGICAL_MINIMUM(8, 0x00),
+           HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+           HID_RI_REPORT_SIZE(8, 0x08),
+           HID_RI_REPORT_COUNT(8, GENERIC_REPORT_SIZE),
+           HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+       HID_RI_END_COLLECTION(0),
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
@@ -68,14 +68,14 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
  *  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},
 
        .USBSpecification       = VERSION_BCD(01.10),
-       .Class                  = 0x00,
-       .SubClass               = 0x00,
-       .Protocol               = 0x00,
+       .Class                  = USB_CSCP_NoDeviceClass,
+       .SubClass               = USB_CSCP_NoDeviceSubclass,
+       .Protocol               = USB_CSCP_NoDeviceProtocol,
 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
@@ -95,7 +95,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.
  */
-USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 {
        .Config =
                {
@@ -121,9 +121,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 2,
 
-                       .Class                  = 0x03,
-                       .SubClass               = 0x00,
-                       .Protocol               = 0x00,
+                       .Class                  = HID_CSCP_HIDClass,
+                       .SubClass               = HID_CSCP_NonBootSubclass,
+                       .Protocol               = HID_CSCP_NonBootProtocol,
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | GENERIC_IN_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = GENERIC_EPSIZE,
-                       .PollingIntervalMS      = 0x0A
+                       .PollingIntervalMS      = 0x01
                },
 
        .HID_ReportOUTEndpoint =
@@ -156,7 +156,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | GENERIC_OUT_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = GENERIC_EPSIZE,
-                       .PollingIntervalMS      = 0x0A
+                       .PollingIntervalMS      = 0x01
                }
 };
 
@@ -164,7 +164,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.
  */
-USB_Descriptor_String_t PROGMEM LanguageString =
+const USB_Descriptor_String_t PROGMEM LanguageString =
 {
        .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
 
@@ -175,7 +175,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.
  */
-USB_Descriptor_String_t PROGMEM ManufacturerString =
+const USB_Descriptor_String_t PROGMEM ManufacturerString =
 {
        .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
 
@@ -186,7 +186,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.
  */
-USB_Descriptor_String_t PROGMEM ProductString =
+const USB_Descriptor_String_t PROGMEM ProductString =
 {
        .Header                 = {.Size = USB_STRING_LEN(21), .Type = DTYPE_String},