devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

iPod mini 2G: Define correct audio codec, and fix WM8731 driver to work with PP5020. Audio is working now.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9367 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2006-03-30 20:18:02 +00:00
parent d5c927d92f
commit 7e0ea2153c
7 changed files with 89 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

17
firmware/pcm_playback.c
View file

@ -31,7 +31,7 @@
#include "wm8758.h"
#elif defined(HAVE_TLV320)
#include "tlv320.h"
#elif defined(HAVE_WM8731)
#elif defined(HAVE_WM8731) || defined(HAVE_WM8721)
#include "wm8731l.h"
#endif
#include "system.h"
@ -237,7 +237,8 @@ void pcm_init(void)
dma_stop();
}
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731)
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721)
/* We need to unify this code with the uda1380 code as much as possible, but
we will keep it separate during early development.
@ -522,7 +523,8 @@ void pcm_mute(bool mute)
{
#ifdef HAVE_UDA1380
uda1380_mute(mute);
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731)
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721)
wmcodec_mute(mute);
#elif defined(HAVE_TLV320)
tlv320_mute(mute);
@ -557,7 +559,8 @@ void pcm_play_pause(bool play)
EBU1CONFIG = EBU_DEFPARM;
#endif
DCR0 |= DMA_EEXT | DMA_START;
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731)
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721)
/* Enable the FIFO and fill it */
enable_fiq();
@ -616,7 +619,8 @@ void pcm_play_pause(bool play)
#ifdef HAVE_SPDIF_OUT
EBU1CONFIG = IIS_RESET | EBU_DEFPARM;
#endif
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731)
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721)
#if CONFIG_CPU == PP5020
/* Disable the interrupt */
IISCONFIG &= ~0x2;
@ -672,7 +676,8 @@ void pcm_calculate_peaks(int *left, int *right)
#ifdef CPU_COLDFIRE
size_t samples = (BCR0 & 0xffffff) / 4;
addr = (short *) (SAR0 & ~3);
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731)
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721)
size_t samples = p_size / 4;
addr = p;
#endif