From 242b80c63ffff022172755da35fb4767d5f837c2 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 30 Jan 2023 18:47:50 +1100
Subject: [PATCH] Move MIDI code out of tmk_core (#19704)

---
 builddefs/common_features.mk                          |  7 +++++++
 docs/feature_midi.md                                  |  8 ++++----
 .../protocol => quantum}/midi/Config/LUFAConfig.h     |  0
 {tmk_core/protocol => quantum}/midi/bytequeue/COPYING |  0
 .../protocol => quantum}/midi/bytequeue/bytequeue.c   |  0
 .../protocol => quantum}/midi/bytequeue/bytequeue.h   |  0
 .../midi/bytequeue/interrupt_setting.c                |  0
 .../midi/bytequeue/interrupt_setting.h                |  0
 {tmk_core/protocol => quantum}/midi/midi.c            |  0
 {tmk_core/protocol => quantum}/midi/midi.h            |  0
 {tmk_core/protocol => quantum}/midi/midi_device.c     |  0
 {tmk_core/protocol => quantum}/midi/midi_device.h     |  0
 .../protocol => quantum}/midi/midi_function_types.h   |  0
 {tmk_core/protocol => quantum}/midi/qmk_midi.c        |  0
 {tmk_core/protocol => quantum}/midi/qmk_midi.h        |  0
 {tmk_core/protocol => quantum}/midi/sysex_tools.c     |  0
 {tmk_core/protocol => quantum}/midi/sysex_tools.h     |  0
 tmk_core/protocol/chibios.mk                          |  4 ----
 tmk_core/protocol/lufa.mk                             |  4 ----
 tmk_core/protocol/midi.mk                             | 11 -----------
 20 files changed, 11 insertions(+), 23 deletions(-)
 rename {tmk_core/protocol => quantum}/midi/Config/LUFAConfig.h (100%)
 rename {tmk_core/protocol => quantum}/midi/bytequeue/COPYING (100%)
 rename {tmk_core/protocol => quantum}/midi/bytequeue/bytequeue.c (100%)
 rename {tmk_core/protocol => quantum}/midi/bytequeue/bytequeue.h (100%)
 rename {tmk_core/protocol => quantum}/midi/bytequeue/interrupt_setting.c (100%)
 rename {tmk_core/protocol => quantum}/midi/bytequeue/interrupt_setting.h (100%)
 rename {tmk_core/protocol => quantum}/midi/midi.c (100%)
 rename {tmk_core/protocol => quantum}/midi/midi.h (100%)
 rename {tmk_core/protocol => quantum}/midi/midi_device.c (100%)
 rename {tmk_core/protocol => quantum}/midi/midi_device.h (100%)
 rename {tmk_core/protocol => quantum}/midi/midi_function_types.h (100%)
 rename {tmk_core/protocol => quantum}/midi/qmk_midi.c (100%)
 rename {tmk_core/protocol => quantum}/midi/qmk_midi.h (100%)
 rename {tmk_core/protocol => quantum}/midi/sysex_tools.c (100%)
 rename {tmk_core/protocol => quantum}/midi/sysex_tools.h (100%)
 delete mode 100644 tmk_core/protocol/midi.mk

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index dbcfcb7145..4e032f9dcf 100644
--- 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
index 1f0809ef14..775a5e34ee 100644
--- 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 b/quantum/midi/Config/LUFAConfig.h
similarity index 100%
rename from tmk_core/protocol/midi/Config/LUFAConfig.h
rename to quantum/midi/Config/LUFAConfig.h
diff --git a/tmk_core/protocol/midi/bytequeue/COPYING b/quantum/midi/bytequeue/COPYING
similarity index 100%
rename from tmk_core/protocol/midi/bytequeue/COPYING
rename to quantum/midi/bytequeue/COPYING
diff --git a/tmk_core/protocol/midi/bytequeue/bytequeue.c b/quantum/midi/bytequeue/bytequeue.c
similarity index 100%
rename from tmk_core/protocol/midi/bytequeue/bytequeue.c
rename to quantum/midi/bytequeue/bytequeue.c
diff --git a/tmk_core/protocol/midi/bytequeue/bytequeue.h b/quantum/midi/bytequeue/bytequeue.h
similarity index 100%
rename from tmk_core/protocol/midi/bytequeue/bytequeue.h
rename to quantum/midi/bytequeue/bytequeue.h
diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/quantum/midi/bytequeue/interrupt_setting.c
similarity index 100%
rename from tmk_core/protocol/midi/bytequeue/interrupt_setting.c
rename to quantum/midi/bytequeue/interrupt_setting.c
diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.h b/quantum/midi/bytequeue/interrupt_setting.h
similarity index 100%
rename from tmk_core/protocol/midi/bytequeue/interrupt_setting.h
rename to quantum/midi/bytequeue/interrupt_setting.h
diff --git a/tmk_core/protocol/midi/midi.c b/quantum/midi/midi.c
similarity index 100%
rename from tmk_core/protocol/midi/midi.c
rename to quantum/midi/midi.c
diff --git a/tmk_core/protocol/midi/midi.h b/quantum/midi/midi.h
similarity index 100%
rename from tmk_core/protocol/midi/midi.h
rename to quantum/midi/midi.h
diff --git a/tmk_core/protocol/midi/midi_device.c b/quantum/midi/midi_device.c
similarity index 100%
rename from tmk_core/protocol/midi/midi_device.c
rename to quantum/midi/midi_device.c
diff --git a/tmk_core/protocol/midi/midi_device.h b/quantum/midi/midi_device.h
similarity index 100%
rename from tmk_core/protocol/midi/midi_device.h
rename to quantum/midi/midi_device.h
diff --git a/tmk_core/protocol/midi/midi_function_types.h b/quantum/midi/midi_function_types.h
similarity index 100%
rename from tmk_core/protocol/midi/midi_function_types.h
rename to quantum/midi/midi_function_types.h
diff --git a/tmk_core/protocol/midi/qmk_midi.c b/quantum/midi/qmk_midi.c
similarity index 100%
rename from tmk_core/protocol/midi/qmk_midi.c
rename to quantum/midi/qmk_midi.c
diff --git a/tmk_core/protocol/midi/qmk_midi.h b/quantum/midi/qmk_midi.h
similarity index 100%
rename from tmk_core/protocol/midi/qmk_midi.h
rename to quantum/midi/qmk_midi.h
diff --git a/tmk_core/protocol/midi/sysex_tools.c b/quantum/midi/sysex_tools.c
similarity index 100%
rename from tmk_core/protocol/midi/sysex_tools.c
rename to quantum/midi/sysex_tools.c
diff --git a/tmk_core/protocol/midi/sysex_tools.h b/quantum/midi/sysex_tools.h
similarity index 100%
rename from tmk_core/protocol/midi/sysex_tools.h
rename to quantum/midi/sysex_tools.h
diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios.mk
index a7f2d8e93d..8eaf5b10d2 100644
--- 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
index 00fec478ac..a67939906e 100644
--- 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
deleted file mode 100644
index a5f76b2d31..0000000000
--- a/tmk_core/protocol/midi.mk
+++ /dev/null
@@ -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)