X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fterminal_usb%2FMakefile;h=78208f7f497055633526de9beacba6ad76f46eff;hb=ffb52ab0c98540f6305a7c1d82b50c8d6611a727;hp=6154d86826498e4adc8b94fa35a2a984d217776c;hpb=29c6f8d953691ad82531960cbd68cb84a9e2fd95;p=max%2Ftmk_keyboard.git

diff --git a/converter/terminal_usb/Makefile b/converter/terminal_usb/Makefile
index 6154d868..78208f7f 100644
--- a/converter/terminal_usb/Makefile
+++ b/converter/terminal_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = terminal_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -70,7 +70,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
+#NKRO_ENABLE = yes	# USB Nkey Rollover
 
 
 #
@@ -78,25 +78,10 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 # 	USART is recommended if it is available, others are for reference purpose.
 # 	INT implementation will drop simultaneous key strokes.
 #
-PS2_USE_USART = yes	# uses hardware USART engine for PS/2 signal receive(recomened)
-#PS2_USE_INT = yes	# uses external interrupt for falling edge of PS/2 clock pin
+#PS2_USE_USART = yes	# uses hardware USART engine for PS/2 signal receive(recomened)
+PS2_USE_INT = yes	# uses external interrupt for falling edge of PS/2 clock pin
 #PS2_USE_BUSYWAIT = yes	# uses primitive reference code
 
-ifdef PS2_USE_USART
-    SRC += protocol/ps2_usart.c
-    OPT_DEFS += -DPS2_USE_USART
-endif
-
-ifdef PS2_USE_INT
-    SRC += protocol/ps2.c
-    OPT_DEFS += -DPS2_USE_INT
-endif
-
-ifdef PS2_USE_BUSYWAIT
-    SRC += protocol/ps2.c
-    OPT_DEFS += -DPS2_USE_BUSYWAIT
-endif
-
 
 #---------------- Programming Options --------------------------
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
@@ -104,10 +89,9 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
-
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk