summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-04-28 08:55:07 +0900
committertmk <nobody@nowhere>2014-04-28 08:55:07 +0900
commit37cf2607648a40bbac0b37f7e0838f240e66450a (patch)
treeab6aec5dfd7b9b1da06c9e1eb81acb7571d5af64
parent22854eb71b84a10ebad0f85841f2b99d38e1da8c (diff)
Check if LUFA-git really exists(Fix #118)
-rw-r--r--protocol/lufa.mk2
-rw-r--r--protocol/lufa/descriptor.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 48ce9ae879..ac70ac0391 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,7 +1,7 @@
LUFA_DIR = protocol/lufa
# Path to the LUFA library
-ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git))
+ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h))
LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730
else
LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
diff --git a/protocol/lufa/descriptor.h b/protocol/lufa/descriptor.h
index e0acec8050..a2db4bfd7b 100644
--- a/protocol/lufa/descriptor.h
+++ b/protocol/lufa/descriptor.h
@@ -162,6 +162,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
/* 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) | \