All USB class drivers are now automatically included when LUFA/Drivers/USB.h is inclu...

[pub/USBasp.git] / Demos / Device / LowLevel / Joystick / Descriptors.h

diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.h b/Demos/Device/LowLevel/Joystick/Descriptors.h
index 76f6097..e58d9a4 100644 (file)
--- a/Demos/Device/LowLevel/Joystick/Descriptors.h
+++ b/Demos/Device/LowLevel/Joystick/Descriptors.h
@@ -42,25 +42,6 @@
                #include <avr/pgmspace.h>
 
        /* Type Defines: */
-               /** Type define for the HID class specific HID descriptor, to describe the HID device's specifications. Refer to the HID
-                *  specification for details on the structure elements.
-                */
-               typedef struct
-               {
-                       USB_Descriptor_Header_t               Header;
-
-                       uint16_t                              HIDSpec;
-                       uint8_t                               CountryCode;
-
-                       uint8_t                               TotalReportDescriptors;
-
-                       uint8_t                               HIDReportType;
-                       uint16_t                              HIDReportLength;
-               } USB_Descriptor_HID_t;
-
-               /** Type define for the data type used to store HID report descriptor elements. */
-               typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;
-
                /** Type define for the device configuration descriptor structure. This must be defined in the
                 *  application code, as the configuration descriptor contains several sub-descriptors which
                 *  vary between devices, and which describe the device's usage to the host.
@@ -69,7 +50,7 @@
                {
                        USB_Descriptor_Configuration_Header_t Config;
                        USB_Descriptor_Interface_t            HID_Interface;
-                       USB_Descriptor_HID_t                  HID_JoystickHID;
+                       USB_HID_Descriptor_HID_t              HID_JoystickHID;
                USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;
                } USB_Descriptor_Configuration_t;