diff options
Diffstat (limited to 'firmware/pcm_playback.c')
-rw-r--r-- | firmware/pcm_playback.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index 9e28891e6d..d6dc41cdde 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "wm8758.h" | 31 | #include "wm8758.h" |
32 | #elif defined(HAVE_TLV320) | 32 | #elif defined(HAVE_TLV320) |
33 | #include "tlv320.h" | 33 | #include "tlv320.h" |
34 | #elif defined(HAVE_WM8731) | 34 | #elif defined(HAVE_WM8731) || defined(HAVE_WM8721) |
35 | #include "wm8731l.h" | 35 | #include "wm8731l.h" |
36 | #endif | 36 | #endif |
37 | #include "system.h" | 37 | #include "system.h" |
@@ -237,7 +237,8 @@ void pcm_init(void) | |||
237 | dma_stop(); | 237 | dma_stop(); |
238 | } | 238 | } |
239 | 239 | ||
240 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) | 240 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
241 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
241 | 242 | ||
242 | /* We need to unify this code with the uda1380 code as much as possible, but | 243 | /* We need to unify this code with the uda1380 code as much as possible, but |
243 | we will keep it separate during early development. | 244 | we will keep it separate during early development. |
@@ -522,7 +523,8 @@ void pcm_mute(bool mute) | |||
522 | { | 523 | { |
523 | #ifdef HAVE_UDA1380 | 524 | #ifdef HAVE_UDA1380 |
524 | uda1380_mute(mute); | 525 | uda1380_mute(mute); |
525 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) | 526 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
527 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
526 | wmcodec_mute(mute); | 528 | wmcodec_mute(mute); |
527 | #elif defined(HAVE_TLV320) | 529 | #elif defined(HAVE_TLV320) |
528 | tlv320_mute(mute); | 530 | tlv320_mute(mute); |
@@ -557,7 +559,8 @@ void pcm_play_pause(bool play) | |||
557 | EBU1CONFIG = EBU_DEFPARM; | 559 | EBU1CONFIG = EBU_DEFPARM; |
558 | #endif | 560 | #endif |
559 | DCR0 |= DMA_EEXT | DMA_START; | 561 | DCR0 |= DMA_EEXT | DMA_START; |
560 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) | 562 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
563 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
561 | /* Enable the FIFO and fill it */ | 564 | /* Enable the FIFO and fill it */ |
562 | 565 | ||
563 | enable_fiq(); | 566 | enable_fiq(); |
@@ -616,7 +619,8 @@ void pcm_play_pause(bool play) | |||
616 | #ifdef HAVE_SPDIF_OUT | 619 | #ifdef HAVE_SPDIF_OUT |
617 | EBU1CONFIG = IIS_RESET | EBU_DEFPARM; | 620 | EBU1CONFIG = IIS_RESET | EBU_DEFPARM; |
618 | #endif | 621 | #endif |
619 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) | 622 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
623 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
620 | #if CONFIG_CPU == PP5020 | 624 | #if CONFIG_CPU == PP5020 |
621 | /* Disable the interrupt */ | 625 | /* Disable the interrupt */ |
622 | IISCONFIG &= ~0x2; | 626 | IISCONFIG &= ~0x2; |
@@ -672,7 +676,8 @@ void pcm_calculate_peaks(int *left, int *right) | |||
672 | #ifdef CPU_COLDFIRE | 676 | #ifdef CPU_COLDFIRE |
673 | size_t samples = (BCR0 & 0xffffff) / 4; | 677 | size_t samples = (BCR0 & 0xffffff) / 4; |
674 | addr = (short *) (SAR0 & ~3); | 678 | addr = (short *) (SAR0 & ~3); |
675 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) | 679 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
680 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
676 | size_t samples = p_size / 4; | 681 | size_t samples = p_size / 4; |
677 | addr = p; | 682 | addr = p; |
678 | #endif | 683 | #endif |