X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fprotocol%2Flufa%2Fdescriptor.h;h=ed58f21e1227d89f1f6a28b1898f3704eb6c9982;hb=78e05bd172aca74b30293d9c5964ef3c706ad4db;hp=8aaa32c52b47ff0284af28ba88b08b15a6336db5;hpb=a567fec91c0f9020cf050ae80410b891486f2ba3;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/protocol/lufa/descriptor.h b/tmk_core/protocol/lufa/descriptor.h
index 8aaa32c5..ed58f21e 100644
--- a/tmk_core/protocol/lufa/descriptor.h
+++ b/tmk_core/protocol/lufa/descriptor.h
@@ -121,32 +121,35 @@ typedef struct
 
 
 // Endopoint number and size
-#define CUR_EPNUM                   1
-#define KEYBOARD_IN_EPNUM           CUR_EPNUM
+#define KEYBOARD_IN_EPNUM           1
 
 #ifdef MOUSE_ENABLE
-#   define CUR_EPNUM                (CUR_EPNUM + 1)
-#   define MOUSE_IN_EPNUM           CUR_EPNUM
+#   define MOUSE_IN_EPNUM           (KEYBOARD_IN_EPNUM + 1) 
+#else
+#   define MOUSE_IN_EPNUM           KEYBOARD_IN_EPNUM
 #endif
 
 #ifdef EXTRAKEY_ENABLE
-#   define CUR_EPNUM                (CUR_EPNUM + 1)
-#   define EXTRAKEY_IN_EPNUM        CUR_EPNUM
+#   define EXTRAKEY_IN_EPNUM        (MOUSE_IN_EPNUM + 1)
+#else
+#   define EXTRAKEY_IN_EPNUM        MOUSE_IN_EPNUM 
 #endif
 
 #ifdef CONSOLE_ENABLE
-#   define CUR_EPNUM                (CUR_EPNUM + 1)
-#   define CONSOLE_IN_EPNUM         CUR_EPNUM
-#   define CONSOLE_OUT_EPNUM        CUR_EPNUM
+#   define CONSOLE_IN_EPNUM         (EXTRAKEY_IN_EPNUM + 1)
+#   define CONSOLE_OUT_EPNUM        (EXTRAKEY_IN_EPNUM + 1)
+#else
+#   define CONSOLE_OUT_EPNUM        EXTRAKEY_IN_EPNUM
 #endif
 
 #ifdef NKRO_ENABLE
-#   define CUR_EPNUM                (CUR_EPNUM + 1)
-#   define NKRO_IN_EPNUM            CUR_EPNUM
+#   define NKRO_IN_EPNUM            (CONSOLE_OUT_EPNUM + 1)
+#else
+#   define NKRO_IN_EPNUM            CONSOLE_OUT_EPNUM
 #endif
 
 /* Check number of endpoints. ATmega32u2 has only four except for control endpoint. */
-#if defined(__AVR_ATmega32U2__) && CUR_EPNUM > 4
+#if defined(__AVR_ATmega32U2__) && NKRO_IN_EPNUM > 4
 #   error "Endpoints are not available enough to support all functions. Disable some of build options in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO)"
 #endif
 
@@ -159,18 +162,8 @@ typedef struct
 
 
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                     const void** const DescriptorAddress)
                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
-
-/* new API */
-#if LUFA_VERSION_INTEGER < 0x140302
-    #undef VERSION_BCD
-    #define VERSION_BCD(Major, Minor, Revision) \
-                                              CPU_TO_LE16( ((Major & 0xFF) << 8) | \
-                                                           ((Minor & 0x0F) << 4) | \
-                                                           (Revision & 0x0F) )
-#endif
-
 #endif