20 files changed, 11 insertions(+), 23 deletions(-)

M builddefs/common_features.mk
M docs/feature_midi.md
R {tmk_core/protocol => quantum}/midi/Config/LUFAConfig.h
R {tmk_core/protocol => quantum}/midi/bytequeue/COPYING
R {tmk_core/protocol => quantum}/midi/bytequeue/bytequeue.c
R {tmk_core/protocol => quantum}/midi/bytequeue/bytequeue.h
R {tmk_core/protocol => quantum}/midi/bytequeue/interrupt_setting.c
R {tmk_core/protocol => quantum}/midi/bytequeue/interrupt_setting.h
R {tmk_core/protocol => quantum}/midi/midi.c
R {tmk_core/protocol => quantum}/midi/midi.h
R {tmk_core/protocol => quantum}/midi/midi_device.c
R {tmk_core/protocol => quantum}/midi/midi_device.h
R {tmk_core/protocol => quantum}/midi/midi_function_types.h
R {tmk_core/protocol => quantum}/midi/qmk_midi.c
R {tmk_core/protocol => quantum}/midi/qmk_midi.h
R {tmk_core/protocol => quantum}/midi/sysex_tools.c
R {tmk_core/protocol => quantum}/midi/sysex_tools.h
M tmk_core/protocol/chibios.mk
M tmk_core/protocol/lufa.mk
D tmk_core/protocol/midi.mk

@@ 84,6 84,13 @@ endif
 ifeq ($(strip $(MIDI_ENABLE)), yes)
     OPT_DEFS += -DMIDI_ENABLE
     MUSIC_ENABLE = yes
+    COMMON_VPATH += $(QUANTUM_PATH)/midi
+    SRC += $(QUANTUM_DIR)/midi/midi.c
+    SRC += $(QUANTUM_DIR)/midi/midi_device.c
+    SRC += $(QUANTUM_DIR)/midi/qmk_midi.c
+    SRC += $(QUANTUM_DIR)/midi/sysex_tools.c
+    SRC += $(QUANTUM_DIR)/midi/bytequeue/bytequeue.c
+    SRC += $(QUANTUM_DIR)/midi/bytequeue/interrupt_setting.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
 endif
 

@@ 250,10 250,10 @@ For the above, the `MI_C` keycode will produce a C3 (note number 48), and so on.
 
  * `quantum/process_keycode/process_midi.c`
  * `quantum/quantum_keycodes.h`
- * `tmk_core/protocol/midi.h`
- * `tmk_core/protocol/midi.c`
- * `tmk_core/protocol/qmk_midi.c`
- * `tmk_core/protocol/midi_device.h`
+ * `quantum/midi/midi.h`
+ * `quantum/midi/midi.c`
+ * `quantum/midi/qmk_midi.c`
+ * `quantum/midi/midi_device.h`
 
 <!--
 #### QMK Internals (Autogenerated)

@@ 15,7 15,3 @@ VPATH += $(TMK_PATH)/$(CHIBIOS_DIR)/lufa_utils
 
 OPT_DEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=64
 OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
-
-ifeq ($(strip $(MIDI_ENABLE)), yes)
-  include $(TMK_PATH)/protocol/midi.mk
-endif

@@ 17,10 17,6 @@ LUFA_SRC = lufa.c \
 	usb_descriptor.c \
 	$(LUFA_SRC_USB)
 
-ifeq ($(strip $(MIDI_ENABLE)), yes)
-	include $(TMK_PATH)/protocol/midi.mk
-endif
-
 ifeq ($(strip $(VIRTSER_ENABLE)), yes)
 	LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c
 endif

@@ 1,11 0,0 @@
-MIDI_DIR = protocol/midi
-
-SRC += midi.c \
-	   midi_device.c \
-	   bytequeue/bytequeue.c \
-	   bytequeue/interrupt_setting.c \
-	   sysex_tools.c \
-     qmk_midi.c \
-	   $(LUFA_SRC_USBCLASS)
-
-VPATH += $(TMK_PATH)/$(MIDI_DIR)