diff options
Diffstat (limited to 'drivers/gaudio')
-rw-r--r-- | drivers/gaudio/Win32/driver.mk | 6 | ||||
-rw-r--r-- | drivers/gaudio/Win32/gaudio_play_Win32.c (renamed from drivers/gaudio/Win32/gaudio_play_lld.c) | 2 | ||||
-rw-r--r-- | drivers/gaudio/Win32/gaudio_record_Win32.c (renamed from drivers/gaudio/Win32/gaudio_record_lld.c) | 2 | ||||
-rw-r--r-- | drivers/gaudio/gadc/driver.mk | 5 | ||||
-rw-r--r-- | drivers/gaudio/gadc/gaudio_record_gadc.c (renamed from drivers/gaudio/gadc/gaudio_record_lld.c) | 2 | ||||
-rw-r--r-- | drivers/gaudio/pwm/driver.mk | 5 | ||||
-rw-r--r-- | drivers/gaudio/pwm/gaudio_play_pwm.c (renamed from drivers/gaudio/pwm/gaudio_play_lld.c) | 2 | ||||
-rw-r--r-- | drivers/gaudio/vs1053/driver.mk | 7 | ||||
-rw-r--r-- | drivers/gaudio/vs1053/gaudio_play_vs1053.c (renamed from drivers/gaudio/vs1053/gaudio_play_lld.c) | 4 |
9 files changed, 11 insertions, 24 deletions
diff --git a/drivers/gaudio/Win32/driver.mk b/drivers/gaudio/Win32/driver.mk index f959279f..aa3ed3ab 100644 --- a/drivers/gaudio/Win32/driver.mk +++ b/drivers/gaudio/Win32/driver.mk @@ -1,6 +1,4 @@ -# List the required driver. -GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_lld.c \ - $(GFXLIB)/drivers/gaudio/Win32/gaudio_play_lld.c - GFXINC += $(GFXLIB)/drivers/gaudio/Win32 +GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_Win32.c \ + $(GFXLIB)/drivers/gaudio/Win32/gaudio_play_Win32.c GFXLIBS += winmm diff --git a/drivers/gaudio/Win32/gaudio_play_lld.c b/drivers/gaudio/Win32/gaudio_play_Win32.c index 03d9acea..baafd4ce 100644 --- a/drivers/gaudio/Win32/gaudio_play_lld.c +++ b/drivers/gaudio/Win32/gaudio_play_Win32.c @@ -13,7 +13,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY /* Include the driver defines */ -#include "src/gaudio/gaudio_driver_play.h" +#include "../../../src/gaudio/gaudio_driver_play.h" #undef Red #undef Green diff --git a/drivers/gaudio/Win32/gaudio_record_lld.c b/drivers/gaudio/Win32/gaudio_record_Win32.c index dd1a201a..e3e122d8 100644 --- a/drivers/gaudio/Win32/gaudio_record_lld.c +++ b/drivers/gaudio/Win32/gaudio_record_Win32.c @@ -13,7 +13,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD /* Include the driver defines */ -#include "src/gaudio/gaudio_driver_record.h" +#include "../../../src/gaudio/gaudio_driver_record.h" #undef Red #undef Green diff --git a/drivers/gaudio/gadc/driver.mk b/drivers/gaudio/gadc/driver.mk index b5a2768a..f9d2db03 100644 --- a/drivers/gaudio/gadc/driver.mk +++ b/drivers/gaudio/gadc/driver.mk @@ -1,8 +1,5 @@ -# List the required driver. -GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_lld.c - -# Required include directories GFXINC += $(GFXLIB)/drivers/gaudio/gadc +GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_gadc.c # Make sure the GADC sub-system is turned on GFXDEFS += -DGFX_USE_GADC=GAUDIO_NEED_RECORD diff --git a/drivers/gaudio/gadc/gaudio_record_lld.c b/drivers/gaudio/gadc/gaudio_record_gadc.c index 6495309a..a35d070b 100644 --- a/drivers/gaudio/gadc/gaudio_record_lld.c +++ b/drivers/gaudio/gadc/gaudio_record_gadc.c @@ -16,7 +16,7 @@ #endif /* Include the driver defines */ -#include "src/gaudio/gaudio_driver_record.h" +#include "../../../src/gaudio/gaudio_driver_record.h" static void gadcCallbackI(void) { GDataBuffer *pd; diff --git a/drivers/gaudio/pwm/driver.mk b/drivers/gaudio/pwm/driver.mk index 52f752aa..32f74c28 100644 --- a/drivers/gaudio/pwm/driver.mk +++ b/drivers/gaudio/pwm/driver.mk @@ -1,5 +1,2 @@ -# List the required driver. -GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_lld.c - -# Required include directories GFXINC += $(GFXLIB)/drivers/gaudio/pwm +GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_pwm.c diff --git a/drivers/gaudio/pwm/gaudio_play_lld.c b/drivers/gaudio/pwm/gaudio_play_pwm.c index d4d85c33..91d7a835 100644 --- a/drivers/gaudio/pwm/gaudio_play_lld.c +++ b/drivers/gaudio/pwm/gaudio_play_pwm.c @@ -10,7 +10,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY /* Include the driver defines */ -#include "src/gaudio/gaudio_driver_play.h" +#include "../../../src/gaudio/gaudio_driver_play.h" /* Forward definition */ static void gaudio_play_pwm_timer_callbackI(void); diff --git a/drivers/gaudio/vs1053/driver.mk b/drivers/gaudio/vs1053/driver.mk index faf92852..3dfb3b3d 100644 --- a/drivers/gaudio/vs1053/driver.mk +++ b/drivers/gaudio/vs1053/driver.mk @@ -1,7 +1,2 @@ -# List the required driver. -GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_lld.c - -# Required include directories GFXINC += $(GFXLIB)/drivers/gaudio/vs1053 - -#GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO +GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_vs1053.c diff --git a/drivers/gaudio/vs1053/gaudio_play_lld.c b/drivers/gaudio/vs1053/gaudio_play_vs1053.c index 24c5a176..2aab288c 100644 --- a/drivers/gaudio/vs1053/gaudio_play_lld.c +++ b/drivers/gaudio/vs1053/gaudio_play_vs1053.c @@ -10,10 +10,10 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY /* Include the driver defines */ -#include "src/gaudio/gaudio_driver_play.h" +#include "../../../src/gaudio/gaudio_driver_play.h" /* Include the vs1053 registers */ -#include "drivers/gaudio/vs1053/vs1053.h" +#include "vs1053.h" /* Include the board interface */ #include "gaudio_play_board.h" |