masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if LUFA-git really exists(Fix #118)

This commit is contained in:
tmk 2014-04-28 08:55:07 +09:00
parent 22854eb71b
commit 37cf260764
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocol/lufa.mk
View File

@ -1,7 +1,7 @@
LUFA_DIR = protocol/lufa LUFA_DIR = protocol/lufa
# Path to the LUFA library # 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 LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730
else else
LUFA_PATH ?= $(LUFA_DIR)/LUFA-git LUFA_PATH ?= $(LUFA_DIR)/LUFA-git

1
protocol/lufa/descriptor.h
View File

@ -162,6 +162,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
/* new API */ /* new API */
#if LUFA_VERSION_INTEGER < 0x140302 #if LUFA_VERSION_INTEGER < 0x140302
#undef VERSION_BCD
#define VERSION_BCD(Major, Minor, Revision) \ #define VERSION_BCD(Major, Minor, Revision) \
CPU_TO_LE16( ((Major & 0xFF) << 8) | \ CPU_TO_LE16( ((Major & 0xFF) << 8) | \
((Minor & 0x0F) << 4) | \ ((Minor & 0x0F) << 4) | \