summaryrefslogtreecommitdiff
path: root/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'protocol')
-rw-r--r--protocol/lufa.mk4
-rw-r--r--protocol/lufa/lufa.c2
-rw-r--r--protocol/lufa/lufa.h5
3 files changed, 9 insertions, 2 deletions
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 74a8bef3c6..561c505c22 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -24,7 +24,9 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
$(LUFA_DIR)/midi/midi_device.c \
$(LUFA_DIR)/midi/bytequeue/bytequeue.c \
$(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \
- $(LUFA_DIR)/LUFA-git/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
+ $(LUFA_SRC_USB) \
+ $(LUFA_SRC_USBCLASS)
+
SRC += $(LUFA_SRC)
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index 03b13f4047..78ed6cfe20 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -52,6 +52,8 @@
#include "descriptor.h"
#include "lufa.h"
+// #include <LUFA/Version.h>
+// #include <LUFA/Drivers/USB/USB.h>
uint8_t keyboard_idle = 0;
uint8_t keyboard_protocol = 1;
diff --git a/protocol/lufa/lufa.h b/protocol/lufa/lufa.h
index 505cb3279e..554d82ae5f 100644
--- a/protocol/lufa/lufa.h
+++ b/protocol/lufa/lufa.h
@@ -48,8 +48,9 @@
#include <LUFA/Version.h>
#include <LUFA/Drivers/USB/USB.h>
#include "host.h"
+#ifdef MIDI_ENABLE
#include "midi/midi.h"
-
+#endif
#ifdef __cplusplus
extern "C" {
#endif
@@ -66,7 +67,9 @@ typedef struct {
uint16_t usage;
} __attribute__ ((packed)) report_extra_t;
+#ifdef MIDI_ENABLE
MidiDevice midi_device;
+#endif
#if LUFA_VERSION_INTEGER < 0x120730
/* old API 120219 */