diff options
Diffstat (limited to 'firmware/pcm_playback.c')
-rw-r--r-- | firmware/pcm_playback.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index c55b48699b..1e9cac31f5 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c | |||
@@ -28,6 +28,8 @@ | |||
28 | #include "uda1380.h" | 28 | #include "uda1380.h" |
29 | #elif defined(HAVE_WM8975) | 29 | #elif defined(HAVE_WM8975) |
30 | #include "wm8975.h" | 30 | #include "wm8975.h" |
31 | #elif defined(HAVE_WM8758) | ||
32 | #include "wm8758.h" | ||
31 | #elif defined(HAVE_TLV320) | 33 | #elif defined(HAVE_TLV320) |
32 | #include "tlv320.h" | 34 | #include "tlv320.h" |
33 | #elif defined(HAVE_WM8731L) | 35 | #elif defined(HAVE_WM8731L) |
@@ -314,7 +316,7 @@ void pcm_init(void) | |||
314 | dma_stop(); | 316 | dma_stop(); |
315 | } | 317 | } |
316 | 318 | ||
317 | #elif defined(HAVE_WM8975) | 319 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) |
318 | 320 | ||
319 | /* We need to unify this code with the uda1380 code as much as possible, but | 321 | /* We need to unify this code with the uda1380 code as much as possible, but |
320 | we will keep it separate during early development. | 322 | we will keep it separate during early development. |
@@ -408,7 +410,7 @@ size_t pcm_get_bytes_waiting(void) | |||
408 | 410 | ||
409 | void pcm_mute(bool mute) | 411 | void pcm_mute(bool mute) |
410 | { | 412 | { |
411 | wm8975_mute(mute); | 413 | wmcodec_mute(mute); |
412 | if (mute) | 414 | if (mute) |
413 | sleep(HZ/16); | 415 | sleep(HZ/16); |
414 | } | 416 | } |
@@ -532,15 +534,15 @@ void pcm_init(void) | |||
532 | pcm_paused = false; | 534 | pcm_paused = false; |
533 | 535 | ||
534 | /* Initialize default register values. */ | 536 | /* Initialize default register values. */ |
535 | wm8975_init(); | 537 | wmcodec_init(); |
536 | 538 | ||
537 | /* The uda1380 needs a sleep(HZ) here - do we need one? */ | 539 | /* The uda1380 needs a sleep(HZ) here - do we need one? */ |
538 | 540 | ||
539 | /* Power on */ | 541 | /* Power on */ |
540 | wm8975_enable_output(true); | 542 | wmcodec_enable_output(true); |
541 | 543 | ||
542 | /* Unmute the master channel (DAC should be at zero point now). */ | 544 | /* Unmute the master channel (DAC should be at zero point now). */ |
543 | wm8975_mute(false); | 545 | wmcodec_mute(false); |
544 | 546 | ||
545 | /* Call dma_stop to initialize everything. */ | 547 | /* Call dma_stop to initialize everything. */ |
546 | dma_stop(); | 548 | dma_stop(); |
@@ -625,7 +627,7 @@ void pcm_calculate_peaks(int *left, int *right) | |||
625 | #ifdef HAVE_UDA1380 | 627 | #ifdef HAVE_UDA1380 |
626 | long samples = (BCR0 & 0xffffff) / 4; | 628 | long samples = (BCR0 & 0xffffff) / 4; |
627 | short *addr = (short *) (SAR0 & ~3); | 629 | short *addr = (short *) (SAR0 & ~3); |
628 | #elif defined(HAVE_WM8975) | 630 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) |
629 | long samples = p_size / 4; | 631 | long samples = p_size / 4; |
630 | short *addr = p; | 632 | short *addr = p; |
631 | #elif defined(HAVE_WM8731L) | 633 | #elif defined(HAVE_WM8731L) |