Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

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

diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.h b/Demos/Device/LowLevel/Keyboard/Descriptors.h
index b20d0ae..815381b 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Descriptors.h
+++ b/Demos/Device/LowLevel/Keyboard/Descriptors.h
@@ -7,8 +7,8 @@
 */
 
 /*
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-      Based on code by 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
@@ -77,13 +77,13 @@
                                        
        /* Macros: */
                /** Endpoint number of the Keyboard HID reporting IN endpoint. */
-               #define KEYBOARD_EPNUM               1
+               #define KEYBOARD_IN_EPNUM         1
 
                /** Endpoint number of the Keyboard HID reporting OUT endpoint. */
-               #define KEYBOARD_LEDS_EPNUM          2
+               #define KEYBOARD_OUT_EPNUM        2
                
                /** Size in bytes of the Keyboard HID reporting IN and OUT endpoints. */                
-               #define KEYBOARD_EPSIZE              8
+               #define KEYBOARD_EPSIZE           8
 
                /** Descriptor header type value, to indicate a HID class HID descriptor. */
                #define DTYPE_HID                 0x21
@@ -92,7 +92,9 @@
                #define DTYPE_Report              0x22
 
        /* Function Prototypes: */
-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+               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