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

2 files changed, 8 insertions, 33 deletions

diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
index 34425fa63d..d8c953bbce 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
@@ -28,6 +28,8 @@
 #include "audiohw.h"
 #include "dsp-target.h"
 
+static int pcm_fsel = HW_FREQ_DEFAULT;
+
 void pcm_play_dma_init(void)
 {
     IO_CLK_O1DIV = 3;
@@ -37,7 +39,7 @@ void pcm_play_dma_init(void)
 
     audiohw_init();
 
-    audiohw_set_frequency(1);
+    audiohw_set_frequency(HW_FREQ_DEFAULT);
 
     /* init DSP */
     dsp_init();
@@ -46,42 +48,21 @@ void pcm_play_dma_init(void)
 void pcm_postinit(void)
 {
     audiohw_postinit();
+    pcm_apply_settings();
+
     /* wake DSP */
     dsp_wake();
 }
 
-/* set frequency used by the audio hardware */
-void pcm_set_frequency(unsigned int frequency)
-{
-    int index;
-
-    switch(frequency)
-    {
-        case SAMPR_11:
-        case SAMPR_22:
-            index = 0;
-            break;
-        default:
-        case SAMPR_44:
-            index = 1;
-            break;
-        case SAMPR_88:
-            index = 2;
-            break;
-    }
-
-    audiohw_set_frequency(index);
-} /* pcm_set_frequency */
-
 const void * pcm_play_dma_get_peak_buffer(int *count)
 {
     (void) count;
     return 0;
 }
 
-void pcm_apply_settings(void)
+void pcm_dma_apply_settings(void)
 {
-
+    audiohw_set_frequency(pcm_fsel);
 }
 
 void pcm_play_dma_start(const void *addr, size_t size)
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index 2f0e40757b..4c9cc337a5 100755..100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -41,14 +41,8 @@ void pcm_play_dma_init(void)
 
 }
 
-void pcm_apply_settings(void)
+void pcm_dma_apply_settings(void)
 {
-
-}
-
-void pcm_set_frequency(unsigned int frequency)
-{
-    (void) frequency;
 }
 
 void pcm_play_dma_start(const void *addr, size_t size)