From e69d567d9ebf7d236ff9663b11ac396cc71dcd75 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 12 Dec 2008 11:01:07 +0000 Subject: Bring consistency to pcm implementation and samplerate handling. Less low-level duplication. A small test_sampr fix so it works on coldfire again. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19400 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/pnx0101/pcm-pnx0101.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'firmware/target/arm/pnx0101') diff --git a/firmware/target/arm/pnx0101/pcm-pnx0101.c b/firmware/target/arm/pnx0101/pcm-pnx0101.c index 4f90c5f829..20fca48039 100644 --- a/firmware/target/arm/pnx0101/pcm-pnx0101.c +++ b/firmware/target/arm/pnx0101/pcm-pnx0101.c @@ -27,7 +27,7 @@ short __attribute__((section(".dmabuf"))) dma_buf_left[DMA_BUF_SAMPLES]; short __attribute__((section(".dmabuf"))) dma_buf_right[DMA_BUF_SAMPLES]; -static int pcm_freq = HW_SAMPR_DEFAULT; /* 44.1 is default */ +static int pcm_sampr = HW_SAMPR_DEFAULT; /* 44.1 is default */ unsigned short* p IBSS_ATTR; size_t p_size IBSS_ATTR; @@ -147,8 +147,6 @@ void pcm_init(void) { int i; - pcm_set_frequency(HW_SAMPR_DEFAULT); - memset(dma_buf_left, 0, sizeof(dma_buf_left)); memset(dma_buf_right, 0, sizeof(dma_buf_right)); @@ -193,15 +191,8 @@ void pcm_postinit(void) pcm_apply_settings(); } -void pcm_set_frequency(unsigned int frequency) -{ - (void)frequency; - pcm_freq = HW_SAMPR_DEFAULT; -} - -void pcm_apply_settings(void) +void pcm_dma_apply_settings(void) { - pcm_curr_sampr = pcm_freq; } size_t pcm_get_bytes_waiting(void) -- cgit v1.2.3