Move Audio drivers from quantum to platform drivers folder (qmk#14308)

* Move Audio drivers from quantum to platform drivers folder * fix path for audio drivers Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
ptrxyz · Nov 6, 2021 · 63e1e4d · 63e1e4d
1 parent 0eeca6b
commit 63e1e4d
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 10 deletions.
diff --git a/common_features.mk b/common_features.mk
@@ -83,7 +83,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
     SRC += $(QUANTUM_DIR)/audio/audio.c ## common audio code, hardware agnostic
-    SRC += $(QUANTUM_DIR)/audio/driver_$(PLATFORM_KEY)_$(strip $(AUDIO_DRIVER)).c
+    SRC += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/audio_$(strip $(AUDIO_DRIVER)).c
     SRC += $(QUANTUM_DIR)/audio/voices.c
     SRC += $(QUANTUM_DIR)/audio/luts.c
 endif

diff --git a/quantum/audio/driver_avr_pwm.h → platforms/avr/drivers/audio_pwm.h b/quantum/audio/driver_avr_pwm.h → platforms/avr/drivers/audio_pwm.h
diff --git a/quantum/audio/driver_avr_pwm_hardware.c → platforms/avr/drivers/audio_pwm_hardware.c b/quantum/audio/driver_avr_pwm_hardware.c → platforms/avr/drivers/audio_pwm_hardware.c
diff --git a/quantum/audio/driver_chibios_dac.h → platforms/chibios/drivers/audio_dac.h b/quantum/audio/driver_chibios_dac.h → platforms/chibios/drivers/audio_dac.h
diff --git a/quantum/audio/driver_chibios_dac_additive.c → ...orms/chibios/drivers/audio_dac_additive.c b/quantum/audio/driver_chibios_dac_additive.c → ...orms/chibios/drivers/audio_dac_additive.c
diff --git a/quantum/audio/driver_chibios_dac_basic.c → platforms/chibios/drivers/audio_dac_basic.c b/quantum/audio/driver_chibios_dac_basic.c → platforms/chibios/drivers/audio_dac_basic.c
diff --git a/quantum/audio/driver_chibios_pwm.h → platforms/chibios/drivers/audio_pwm.h b/quantum/audio/driver_chibios_pwm.h → platforms/chibios/drivers/audio_pwm.h
diff --git a/quantum/audio/driver_chibios_pwm_hardware.c → ...orms/chibios/drivers/audio_pwm_hardware.c b/quantum/audio/driver_chibios_pwm_hardware.c → ...orms/chibios/drivers/audio_pwm_hardware.c
diff --git a/quantum/audio/driver_chibios_pwm_software.c → ...orms/chibios/drivers/audio_pwm_software.c b/quantum/audio/driver_chibios_pwm_software.c → ...orms/chibios/drivers/audio_pwm_software.c
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
@@ -26,17 +26,12 @@
 
 #if defined(__AVR__)
 #    include <avr/io.h>
-#    if defined(AUDIO_DRIVER_PWM)
-#        include "driver_avr_pwm.h"
-#    endif
 #endif
 
-#if defined(PROTOCOL_CHIBIOS)
-#    if defined(AUDIO_DRIVER_PWM)
-#        include "driver_chibios_pwm.h"
-#    elif defined(AUDIO_DRIVER_DAC)
-#        include "driver_chibios_dac.h"
-#    endif
+#if defined(AUDIO_DRIVER_PWM)
+#    include "audio_pwm.h"
+#elif defined(AUDIO_DRIVER_DAC)
+#    include "audio_dac.h"
 #endif
 
 typedef union {