summaryrefslogtreecommitdiff
path: root/protocol
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-09 11:22:27 +0900
committertmk <nobody@nowhere>2013-03-09 11:22:27 +0900
commit4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea (patch)
tree25410ede4bbf7d5a8994bb385e6c7ee4ad2f4c0c /protocol
parent359b68d35f0763ab0cafa2fb800e0a3497291f95 (diff)
Add bootmagic.c and fix bootloader_jump
Diffstat (limited to 'protocol')
-rw-r--r--protocol/lufa.mk4
-rw-r--r--protocol/pjrc.mk8
2 files changed, 9 insertions, 3 deletions
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 443b85344b..8ea071afbe 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -39,4 +39,6 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB
OPT_DEFS += -DF_USB=$(F_USB)UL
OPT_DEFS += -DARCH=ARCH_$(ARCH)
OPT_DEFS += $(LUFA_OPTS)
-OPT_DEFS += -DHOST_LUFA
+
+# This indicates using LUFA stack
+OPT_DEFS += -DPROTOCOL_LUFA
diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk
index cccdf62042..f5693ba99d 100644
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
@@ -1,7 +1,5 @@
PJRC_DIR = protocol/pjrc
-OPT_DEFS += -DHOST_PJRC
-
SRC += $(PJRC_DIR)/main.c \
$(PJRC_DIR)/pjrc.c \
$(PJRC_DIR)/usb_keyboard.c \
@@ -19,3 +17,9 @@ endif
# Search Path
VPATH += $(TOP_DIR)/$(PJRC_DIR)
+
+# This indicates using LUFA stack
+# TODO: remove HOST_PJRC
+OPT_DEFS += -DHOST_PJRC
+OPT_DEFS += -DPROTOCOL_PJRC
+