summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-09-01 12:15:43 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-09-01 12:15:43 +0000
commit4db3e8965270dfe813a14c5ee9bcd0b645eb2edf (patch)
treeff785e25196226037c509428497b95f0e1e219b9 /firmware/target/arm
parentd67d6a8462e02770d81d6a01f3193d0a2050fbe2 (diff)
downloadrockbox-4db3e8965270dfe813a14c5ee9bcd0b645eb2edf.tar.gz
rockbox-4db3e8965270dfe813a14c5ee9bcd0b645eb2edf.zip
Shuffle some functions around so that interfacing with playback.c in particular isn't required. Though playback does finish the audio init, pcm doesn't care who does it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30403 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/pcm-as3525.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c2
-rw-r--r--firmware/target/arm/pcm-pp.c2
-rw-r--r--firmware/target/arm/pcm-telechips.c10
-rw-r--r--firmware/target/arm/pnx0101/pcm-pnx0101.c2
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c2
-rw-r--r--firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c2
-rw-r--r--firmware/target/arm/s5l8700/pcm-s5l8700.c2
-rw-r--r--firmware/target/arm/s5l8702/pcm-s5l8702.c2
-rw-r--r--firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c2
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c2
11 files changed, 15 insertions, 15 deletions
diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c
index a89a47d400..f82b373ade 100644
--- a/firmware/target/arm/as3525/pcm-as3525.c
+++ b/firmware/target/arm/as3525/pcm-as3525.c
@@ -181,7 +181,7 @@ void pcm_play_dma_init(void)
audiohw_preinit();
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
index 1f6eef435a..65571a4ee2 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
@@ -247,7 +247,7 @@ void pcm_play_dma_init(void)
audiohw_init();
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index 704296d407..c35a824a25 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -527,7 +527,7 @@ void pcm_play_dma_init(void)
IISCONFIG |= IIS_TXFIFOEN;
}
-void pcm_postinit(void)
+void void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c
index aff43171f6..ae4aa5ef38 100644
--- a/firmware/target/arm/pcm-telechips.c
+++ b/firmware/target/arm/pcm-telechips.c
@@ -57,11 +57,6 @@ struct dma_data dma_play_data SHAREDBSS_ATTR =
.state = 0
};
-void pcm_postinit(void)
-{
- audiohw_postinit();
-}
-
const void * pcm_play_dma_get_peak_buffer(int *count)
{
unsigned long addr = (unsigned long)dma_play_data.p;
@@ -110,6 +105,11 @@ void pcm_play_dma_init(void)
#endif
}
+void pcm_play_dma_postinit(void)
+{
+ audiohw_postinit();
+}
+
void pcm_dma_apply_settings(void)
{
}
diff --git a/firmware/target/arm/pnx0101/pcm-pnx0101.c b/firmware/target/arm/pnx0101/pcm-pnx0101.c
index d4c17454ed..89d56af374 100644
--- a/firmware/target/arm/pnx0101/pcm-pnx0101.c
+++ b/firmware/target/arm/pnx0101/pcm-pnx0101.c
@@ -190,7 +190,7 @@ void pcm_init(void)
DMAR10(1) |= 1;
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
index 33194ae5d9..b133639e12 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
@@ -94,7 +94,7 @@ void pcm_play_dma_init(void)
bitset32(&INTMOD, DMA2_MASK);
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
index 0c69c1e6d3..20332c12f8 100644
--- a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
+++ b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
@@ -120,7 +120,7 @@ void pcm_play_dma_init(void)
bitset32(&INTMOD, DMA2_MASK);
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 14c515ec47..6d733e0ff1 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -262,7 +262,7 @@ void pcm_play_dma_init(void)
audiohw_preinit();
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c
index dbadf3bac0..c3df77f14f 100644
--- a/firmware/target/arm/s5l8702/pcm-s5l8702.c
+++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c
@@ -152,7 +152,7 @@ void pcm_play_dma_init(void)
audiohw_preinit();
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
}
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
index 5ec62cf876..1fda5fe045 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
@@ -44,7 +44,7 @@ void pcm_play_dma_init(void)
// dsp_init();
}
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
audiohw_postinit();
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index 90c342e868..c507428c57 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -35,7 +35,7 @@
*/
static void *start;
-void pcm_postinit(void)
+void pcm_play_dma_postinit(void)
{
/* Configure clock divider */
tsc2100_writereg(CONTROL_PAGE2, TSPP1_ADDRESS, 0x1120);