Added board driver support for the Busware TUL board.

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

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c
index c16e536..fc8d99b 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] 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
@@ -42,35 +42,17 @@
  *  descriptor is parsed by the host and its contents used to determine what data (and in what encoding)
  *  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 JoystickReport[] =
+ */ 
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
 {
-       0x05, 0x01,          /* Usage Page (Generic Desktop)                       */
-       0x09, 0x04,          /* Usage (Joystick)                                   */
-       0xa1, 0x01,          /* Collection (Application)                           */
-       0x09, 0x01,          /*   Usage (Pointer)                                  */
-       0xa1, 0x00,          /*   Collection (Physical)                            */
-       0x05, 0x01,          /*     Usage Page (Generic Desktop)                   */
-       0x09, 0x30,          /*     Usage (X)                                      */
-       0x09, 0x31,          /*     Usage (Y)                                      */
-       0x15, 0x9c,          /*     Logical Minimum (-100)                         */
-       0x25, 0x64,          /*     Logical Maximum (100)                          */
-       0x75, 0x08,          /*     Report Size (8)                                */
-       0x95, 0x02,          /*     Report Count (2)                               */
-       0x81, 0x82,          /*     Input (Data, Variable, Absolute, Volatile)     */
-       0xc0,                /*   End Collection                                   */
-       0x05, 0x09,          /*   Usage Page (Button)                              */
-       0x09, 0x02,          /*   Usage (Button 2)                                 */
-       0x09, 0x01,          /*   Usage (Button 1)                                 */
-       0x15, 0x00,          /*   Logical Minimum (0)                              */
-       0x25, 0x01,          /*   Logical Maximum (1)                              */
-       0x75, 0x01,          /*   Report Size (1)                                  */
-       0x95, 0x02,          /*   Report Count (2)                                 */
-       0x81, 0x02,          /*   Input (Data, Variable, Absolute)                 */
-       0x75, 0x06,          /*   Report Size (6)                                  */
-       0x95, 0x01,          /*   Report Count (1)                                 */
-       0x81, 0x01,          /*   Input (Constant)                                 */
-       0xc0                 /* End Collection                                     */
+       /* Use the HID class driver's standard Joystick report.
+        *   Min X/Y Axis values: -100
+        *   Max X/Y Axis values:  100
+        *   Min physical X/Y Axis values (used to determine resolution): -1
+        *   Max physical X/Y Axis values (used to determine resolution):  1
+        *   Buttons: 2
+        */
+       HID_DESCRIPTOR_JOYSTICK(-100, 100, -1, 1, 2)
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
@@ -78,7 +60,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
  *  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},
 
@@ -105,7 +87,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 =
                {
@@ -164,7 +146,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 +157,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 +168,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(18), .Type = DTYPE_String},