aboutsummaryrefslogtreecommitdiffstats
path: root/converter
diff options
context:
space:
mode:
authorStefan Mark <mark@unserver.de>2014-11-13 12:07:56 +0100
committerStefan Mark <mark@unserver.de>2014-11-13 12:07:56 +0100
commit93915040e7413b164952bcffb2fce4c65ba20147 (patch)
tree1132be4f086227c68e3f14bed4c27652411262f8 /converter
parent8cec0bc9d66cb7da4770e6502e97a426908eb532 (diff)
downloadfirmware-93915040e7413b164952bcffb2fce4c65ba20147.tar.gz
firmware-93915040e7413b164952bcffb2fce4c65ba20147.tar.bz2
firmware-93915040e7413b164952bcffb2fce4c65ba20147.zip
fixed vusb variant of converter ps2usb
Diffstat (limited to 'converter')
-rw-r--r--converter/ps2_usb/Makefile.vusb10
1 files changed, 8 insertions, 2 deletions
diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb
index 1bb44f887..ddf186845 100644
--- a/converter/ps2_usb/Makefile.vusb
+++ b/converter/ps2_usb/Makefile.vusb
@@ -8,10 +8,16 @@ TOP_DIR = ../..
TARGET_DIR = .
# keyboard dependent files
-SRC = keymap.c \
+SRC = keymap_common.c \
matrix.c \
led.c
+ifdef KEYMAP
+ SRC := keymap_$(KEYMAP).c $(SRC)
+else
+ SRC := keymap_plain.c $(SRC)
+endif
+
# Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful.
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
@@ -95,7 +101,7 @@ VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
-include $(TOP_DIR)/protocol/vusb.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
+include $(TOP_DIR)/protocol/vusb.mk
include $(TOP_DIR)/rules.mk