lufa: Update makefile for new LUFA

diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 19fc80d480ed8e086a6141f8524e1ab879f6f112..6e2d559feed9c6f02664c2e9418affe0c25a6379 100644 (file)
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -1,27 +1,34 @@
-LUFA_DIR = protocol/lufa
+TMK_LUFA_DIR = protocol/lufa
 
 # Path to the LUFA library
-LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
+TMK_LUFA_PATH ?= $(TMK_LUFA_DIR)/lufa-abcminiuser
 
 
 # Create the LUFA source path variables by including the LUFA makefile
-ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
-    # New build system from 20120730
-    LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
-    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
+ifneq (, $(wildcard $(TMK_DIR)/$(TMK_LUFA_PATH)/LUFA/Build/LUFA/lufa-sources.mk))
+        LUFA_PATH = $(TMK_LUFA_PATH)/LUFA
+        include $(TMK_DIR)/$(TMK_LUFA_PATH)/LUFA/Build/LUFA/lufa-sources.mk
 else
-    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile
+    $(error LUFA may be too old or not found: try 'git submodule update --init')
+#    ifneq (, $(wildcard $(TMK_DIR)/$(TMK_LUFA_PATH)/LUFA/Build/lufa_sources.mk))
+#        # build system from 20120730
+#        LUFA_PATH = $(TMK_LUFA_PATH)
+#        LUFA_ROOT_PATH = $(TMK_LUFA_PATH)/LUFA
+#        include $(TMK_DIR)/$(TMK_LUFA_PATH)/LUFA/Build/lufa_sources.mk
+#    else
+#        include $(TMK_DIR)/$(TMK_LUFA_PATH)/LUFA/makefile
+#    endif
 endif
 
-LUFA_SRC = $(LUFA_DIR)/lufa.c \
-          $(LUFA_DIR)/descriptor.c \
-          $(LUFA_SRC_USB)
+TMK_LUFA_SRC = $(TMK_LUFA_DIR)/lufa.c \
+               $(TMK_LUFA_DIR)/descriptor.c \
+               $(LUFA_SRC_USB_DEVICE)
 
-SRC += $(LUFA_SRC)
+SRC += $(TMK_LUFA_SRC)
 
 # Search Path
-VPATH += $(TMK_DIR)/$(LUFA_DIR)
-VPATH += $(TMK_DIR)/$(LUFA_PATH)
+VPATH += $(TMK_DIR)/$(TMK_LUFA_DIR)
+VPATH += $(TMK_DIR)/$(TMK_LUFA_PATH)
 
 # Option modules
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
@@ -31,38 +38,39 @@ VPATH += $(TMK_DIR)/$(LUFA_PATH)
 #endif
 
 # LUFA library compile-time options and predefined tokens
-LUFA_OPTS  = -DUSB_DEVICE_ONLY
-LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
-LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-#LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
-LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 
-LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
+TMK_LUFA_OPTS  = -DUSB_DEVICE_ONLY
+TMK_LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
+TMK_LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+#TMK_LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
+TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
+TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
 # Remote wakeup fix for ATmega32U2        https://github.com/tmk/tmk_keyboard/issues/361
 ifeq ($(MCU),atmega32u2)
-       LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
+        TMK_LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
 endif
 
-OPT_DEFS += -DF_USB=$(F_USB)UL
-OPT_DEFS += -DARCH=ARCH_$(ARCH)
-OPT_DEFS += $(LUFA_OPTS)
-
-# This indicates using LUFA stack
-OPT_DEFS += -DPROTOCOL_LUFA
-
 ifeq (yes,$(strip $(LUFA_DEBUG)))
-    LUFA_OPTS += -DLUFA_DEBUG
+    TMK_LUFA_OPTS += -DLUFA_DEBUG
 endif
 
 ifeq (yes,$(strip $(LUFA_DEBUG_SUART)))
     SRC += common/avr/suart.S
-    LUFA_OPTS += -DLUFA_DEBUG_SUART
+    TMK_LUFA_OPTS += -DLUFA_DEBUG_SUART
     # Keep print/debug lines when disabling HID console. See common.mk.
     DEBUG_PRINT_AVAILABLE = yes
 endif
 
 ifeq (yes,$(strip $(LUFA_DEBUG_UART)))
     SRC += common/avr/uart.c
-    LUFA_OPTS += -DLUFA_DEBUG_UART
+    TMK_LUFA_OPTS += -DLUFA_DEBUG_UART
     # Keep print/debug lines when disabling HID console. See common.mk.
     DEBUG_PRINT_AVAILABLE = yes
 endif
+
+
+OPT_DEFS += -DF_USB=$(F_USB)UL
+OPT_DEFS += -DARCH=ARCH_$(ARCH)
+OPT_DEFS += $(TMK_LUFA_OPTS)
+
+# This indicates using LUFA stack
+OPT_DEFS += -DPROTOCOL_LUFA

diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c
index 25356343eea5e8a843ed70765a5c491014f5f38d..141226ada3c5393ee3148046996ac16c7b1ee490 100644 (file)
--- a/tmk_core/protocol/lufa/descriptor.c
+++ b/tmk_core/protocol/lufa/descriptor.c
@@ -523,7 +523,7 @@ const USB_Descriptor_String_t PROGMEM ProductString =
  *  USB host.
  */
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                     const void** const DescriptorAddress)
 {
     const uint8_t  DescriptorType   = (wValue >> 8);

diff --git a/tmk_core/protocol/lufa/descriptor.h b/tmk_core/protocol/lufa/descriptor.h
index 634911179a8c3577f3eb319a10406725c9cef860..ed58f21e1227d89f1f6a28b1898f3704eb6c9982 100644 (file)
--- a/tmk_core/protocol/lufa/descriptor.h
+++ b/tmk_core/protocol/lufa/descriptor.h
@@ -162,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