Oops - revert changes to the Device mode Class Driver VirtualSerial demo makefile.

[pub/USBasp.git] / Projects / Magstripe / Descriptors.h

diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 02a14b4..7180bf3 100644 (file)
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -52,7 +52,7 @@
                {
                        USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */
                        USB_Descriptor_Interface_t            HID_Interface; /**< Keyboard interface descriptor */
                {
                        USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */
                        USB_Descriptor_Interface_t            HID_Interface; /**< Keyboard interface descriptor */

-                       USB_HID_Descriptor_t                  HID_KeyboardHID; /**< Keyboard HID descriptor */
+                       USB_HID_Descriptor_HID_t              HID_KeyboardHID; /**< Keyboard HID descriptor */

                USB_Descriptor_Endpoint_t             HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */
                } USB_Descriptor_Configuration_t;
                                        
                USB_Descriptor_Endpoint_t             HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */
                } USB_Descriptor_Configuration_t;
                                        


@@ -64,7 +64,9 @@
                #define KEYBOARD_EPSIZE              8
 
        /* Function Prototypes: */
                #define KEYBOARD_EPSIZE              8
 
        /* Function Prototypes: */

-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   const void** const DescriptorAddress)

                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif