diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/pcm-pp.c | 17 |
2 files changed, 12 insertions, 12 deletions
diff --git a/firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c b/firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c index 7e1cebc555..0f22aa5c5c 100644 --- a/firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c +++ b/firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "kernel.h" | 20 | #include "kernel.h" |
21 | #include "logf.h" | 21 | #include "logf.h" |
22 | #include "audio.h" | 22 | #include "audio.h" |
23 | #include "wm8975.h" | 23 | #include "sound.h" |
24 | #include "file.h" | 24 | #include "file.h" |
25 | #include "mmu-meg-fx.h" | 25 | #include "mmu-meg-fx.h" |
26 | 26 | ||
@@ -120,7 +120,10 @@ void pcm_init(void) | |||
120 | 120 | ||
121 | } | 121 | } |
122 | 122 | ||
123 | 123 | void pcm_postinit(void) | |
124 | { | ||
125 | audiohw_postinit(); | ||
126 | } | ||
124 | 127 | ||
125 | void pcm_play_dma_start(const void *addr, size_t size) | 128 | void pcm_play_dma_start(const void *addr, size_t size) |
126 | { | 129 | { |
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c index 0cb029eccb..efe6c9b4e6 100644 --- a/firmware/target/arm/pcm-pp.c +++ b/firmware/target/arm/pcm-pp.c | |||
@@ -21,15 +21,7 @@ | |||
21 | #include "kernel.h" | 21 | #include "kernel.h" |
22 | #include "logf.h" | 22 | #include "logf.h" |
23 | #include "audio.h" | 23 | #include "audio.h" |
24 | #if defined(HAVE_WM8975) | 24 | #include "sound.h" |
25 | #include "wm8975.h" | ||
26 | #elif defined(HAVE_WM8758) | ||
27 | #include "wm8758.h" | ||
28 | #elif defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
29 | #include "wm8731l.h" | ||
30 | #endif | ||
31 | |||
32 | |||
33 | 25 | ||
34 | /* peaks */ | 26 | /* peaks */ |
35 | #ifdef HAVE_RECORDING | 27 | #ifdef HAVE_RECORDING |
@@ -334,7 +326,7 @@ size_t pcm_get_bytes_waiting(void) | |||
334 | void pcm_init(void) | 326 | void pcm_init(void) |
335 | { | 327 | { |
336 | } | 328 | } |
337 | void audiohw_postinit(void) | 329 | void pcm_postinit(void) |
338 | { | 330 | { |
339 | } | 331 | } |
340 | #else | 332 | #else |
@@ -356,6 +348,11 @@ void pcm_init(void) | |||
356 | /* Call pcm_play_dma_stop to initialize everything. */ | 348 | /* Call pcm_play_dma_stop to initialize everything. */ |
357 | pcm_play_dma_stop(); | 349 | pcm_play_dma_stop(); |
358 | } | 350 | } |
351 | |||
352 | void pcm_postinit(void) | ||
353 | { | ||
354 | audiohw_postinit(); | ||
355 | } | ||
359 | #endif /* HAVE_PP5024_CODEC */ | 356 | #endif /* HAVE_PP5024_CODEC */ |
360 | 357 | ||
361 | 358 | ||