Remove USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token, split out standard descri...

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

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h
index 1241ad1..aaee982 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.h
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
@@ -51,10 +51,10 @@
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                        USB_Descriptor_Interface_t            Interface;\r
-                       USB_Descriptor_HID_t                  JoystickHID;\r
+                       USB_HID_Descriptor_t                  JoystickHID;\r
                USB_Descriptor_Endpoint_t             JoystickEndpoint;\r
                } USB_Descriptor_Configuration_t;\r
-                                       \r
+\r
        /* Macros: */\r
                /** Endpoint number of the Joystick HID reporting IN endpoint. */\r
                #define JOYSTICK_EPNUM               1\r
@@ -64,6 +64,6 @@
 \r
        /* Function Prototypes: */\r
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
 \r
 #endif\r