Move MIDI code out of tmk_core (qmk#19704)

freznel10 · Jan 30, 2023 · 242b80c · 242b80c
1 parent 968cc1f
commit 242b80c
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 23 deletions.
diff --git a/builddefs/common_features.mk b/builddefs/common_features.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
 

diff --git a/docs/feature_midi.md b/docs/feature_midi.md
@@ -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)

diff --git a/tmk_core/protocol/midi/Config/LUFAConfig.h → quantum/midi/Config/LUFAConfig.h b/tmk_core/protocol/midi/Config/LUFAConfig.h → quantum/midi/Config/LUFAConfig.h
diff --git a/tmk_core/protocol/midi/bytequeue/COPYING → quantum/midi/bytequeue/COPYING b/tmk_core/protocol/midi/bytequeue/COPYING → quantum/midi/bytequeue/COPYING
diff --git a/tmk_core/protocol/midi/bytequeue/bytequeue.c → quantum/midi/bytequeue/bytequeue.c b/tmk_core/protocol/midi/bytequeue/bytequeue.c → quantum/midi/bytequeue/bytequeue.c
diff --git a/tmk_core/protocol/midi/bytequeue/bytequeue.h → quantum/midi/bytequeue/bytequeue.h b/tmk_core/protocol/midi/bytequeue/bytequeue.h → quantum/midi/bytequeue/bytequeue.h
diff --git a/...otocol/midi/bytequeue/interrupt_setting.c → quantum/midi/bytequeue/interrupt_setting.c b/...otocol/midi/bytequeue/interrupt_setting.c → quantum/midi/bytequeue/interrupt_setting.c
diff --git a/...otocol/midi/bytequeue/interrupt_setting.h → quantum/midi/bytequeue/interrupt_setting.h b/...otocol/midi/bytequeue/interrupt_setting.h → quantum/midi/bytequeue/interrupt_setting.h
diff --git a/tmk_core/protocol/midi/midi.c → quantum/midi/midi.c b/tmk_core/protocol/midi/midi.c → quantum/midi/midi.c
diff --git a/tmk_core/protocol/midi/midi.h → quantum/midi/midi.h b/tmk_core/protocol/midi/midi.h → quantum/midi/midi.h
diff --git a/tmk_core/protocol/midi/midi_device.c → quantum/midi/midi_device.c b/tmk_core/protocol/midi/midi_device.c → quantum/midi/midi_device.c
diff --git a/tmk_core/protocol/midi/midi_device.h → quantum/midi/midi_device.h b/tmk_core/protocol/midi/midi_device.h → quantum/midi/midi_device.h
diff --git a/tmk_core/protocol/midi/midi_function_types.h → quantum/midi/midi_function_types.h b/tmk_core/protocol/midi/midi_function_types.h → quantum/midi/midi_function_types.h
diff --git a/tmk_core/protocol/midi/qmk_midi.c → quantum/midi/qmk_midi.c b/tmk_core/protocol/midi/qmk_midi.c → quantum/midi/qmk_midi.c
diff --git a/tmk_core/protocol/midi/qmk_midi.h → quantum/midi/qmk_midi.h b/tmk_core/protocol/midi/qmk_midi.h → quantum/midi/qmk_midi.h
diff --git a/tmk_core/protocol/midi/sysex_tools.c → quantum/midi/sysex_tools.c b/tmk_core/protocol/midi/sysex_tools.c → quantum/midi/sysex_tools.c
diff --git a/tmk_core/protocol/midi/sysex_tools.h → quantum/midi/sysex_tools.h b/tmk_core/protocol/midi/sysex_tools.h → quantum/midi/sysex_tools.h
diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios.mk
@@ -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
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
@@ -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

diff --git a/tmk_core/protocol/midi.mk b/tmk_core/protocol/midi.mk