summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-10-05 18:01:45 -0700
committerGitHub <noreply@github.com>2021-10-06 12:01:45 +1100
commitba8f1454f46537609f65a6abb4bb0e82fecbc2f1 (patch)
tree62560891f23ca176360fbd25e20bd949cceba469
parent9f0e74802a9fef5bad5052ef0f54fa2ab533f578 (diff)
Move Audio drivers from quantum to platform drivers folder (#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>
-rw-r--r--common_features.mk2
-rw-r--r--platforms/avr/drivers/audio_pwm.h (renamed from quantum/audio/driver_avr_pwm.h)0
-rw-r--r--platforms/avr/drivers/audio_pwm_hardware.c (renamed from quantum/audio/driver_avr_pwm_hardware.c)0
-rw-r--r--platforms/chibios/drivers/audio_dac.h (renamed from quantum/audio/driver_chibios_dac.h)0
-rw-r--r--platforms/chibios/drivers/audio_dac_additive.c (renamed from quantum/audio/driver_chibios_dac_additive.c)0
-rw-r--r--platforms/chibios/drivers/audio_dac_basic.c (renamed from quantum/audio/driver_chibios_dac_basic.c)0
-rw-r--r--platforms/chibios/drivers/audio_pwm.h (renamed from quantum/audio/driver_chibios_pwm.h)0
-rw-r--r--platforms/chibios/drivers/audio_pwm_hardware.c (renamed from quantum/audio/driver_chibios_pwm_hardware.c)0
-rw-r--r--platforms/chibios/drivers/audio_pwm_software.c (renamed from quantum/audio/driver_chibios_pwm_software.c)0
-rw-r--r--quantum/audio/audio.h13
10 files changed, 5 insertions, 10 deletions
diff --git a/common_features.mk b/common_features.mk
index a71bcace02..d7b0f826aa 100644
--- 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 b/platforms/avr/drivers/audio_pwm.h
index d6eb3571da..d6eb3571da 100644
--- a/quantum/audio/driver_avr_pwm.h
+++ b/platforms/avr/drivers/audio_pwm.h
diff --git a/quantum/audio/driver_avr_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
index df03a4558c..df03a4558c 100644
--- a/quantum/audio/driver_avr_pwm_hardware.c
+++ b/platforms/avr/drivers/audio_pwm_hardware.c
diff --git a/quantum/audio/driver_chibios_dac.h b/platforms/chibios/drivers/audio_dac.h
index 07cd622ead..07cd622ead 100644
--- a/quantum/audio/driver_chibios_dac.h
+++ b/platforms/chibios/drivers/audio_dac.h
diff --git a/quantum/audio/driver_chibios_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index db304adb87..db304adb87 100644
--- a/quantum/audio/driver_chibios_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
diff --git a/quantum/audio/driver_chibios_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
index fac6513506..fac6513506 100644
--- a/quantum/audio/driver_chibios_dac_basic.c
+++ b/platforms/chibios/drivers/audio_dac_basic.c
diff --git a/quantum/audio/driver_chibios_pwm.h b/platforms/chibios/drivers/audio_pwm.h
index 86cab916e1..86cab916e1 100644
--- a/quantum/audio/driver_chibios_pwm.h
+++ b/platforms/chibios/drivers/audio_pwm.h
diff --git a/quantum/audio/driver_chibios_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index cd40019ee7..cd40019ee7 100644
--- a/quantum/audio/driver_chibios_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
diff --git a/quantum/audio/driver_chibios_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c
index 15c3e98b6a..15c3e98b6a 100644
--- a/quantum/audio/driver_chibios_pwm_software.c
+++ b/platforms/chibios/drivers/audio_pwm_software.c
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 56b9158a1a..290d461f5a 100644
--- 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 {