From 4db3e8965270dfe813a14c5ee9bcd0b645eb2edf Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Thu, 1 Sep 2011 12:15:43 +0000 Subject: 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 --- firmware/target/arm/as3525/pcm-as3525.c | 2 +- firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | 2 +- firmware/target/arm/pcm-pp.c | 2 +- firmware/target/arm/pcm-telechips.c | 10 +++++----- firmware/target/arm/pnx0101/pcm-pnx0101.c | 2 +- firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | 2 +- firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c | 2 +- firmware/target/arm/s5l8700/pcm-s5l8700.c | 2 +- firmware/target/arm/s5l8702/pcm-s5l8702.c | 2 +- firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c | 2 +- firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c | 2 +- firmware/target/coldfire/pcm-coldfire.c | 2 +- firmware/target/hosted/android/pcm-android.c | 2 +- firmware/target/hosted/maemo/pcm-gstreamer.c | 2 +- firmware/target/hosted/sdl/pcm-sdl.c | 2 +- firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) (limited to 'firmware/target') 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); diff --git a/firmware/target/coldfire/pcm-coldfire.c b/firmware/target/coldfire/pcm-coldfire.c index 85eeaec815..e95d445337 100644 --- a/firmware/target/coldfire/pcm-coldfire.c +++ b/firmware/target/coldfire/pcm-coldfire.c @@ -203,7 +203,7 @@ void pcm_play_dma_init(void) #endif } /* pcm_play_dma_init */ -void pcm_postinit(void) +void pcm_play_dma_postinit(void) { audiohw_postinit(); iis_play_reset(); diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c index 6492a779f2..4e58707d0a 100644 --- a/firmware/target/hosted/android/pcm-android.c +++ b/firmware/target/hosted/android/pcm-android.c @@ -206,7 +206,7 @@ void pcm_play_dma_init(void) write_method = e->GetMethodID(env_ptr, RockboxPCM_class, "write", "([BII)I"); } -void pcm_postinit(void) +void pcm_play_dma_postinit(void) { } diff --git a/firmware/target/hosted/maemo/pcm-gstreamer.c b/firmware/target/hosted/maemo/pcm-gstreamer.c index 6e049dbbff..d6879ea083 100644 --- a/firmware/target/hosted/maemo/pcm-gstreamer.c +++ b/firmware/target/hosted/maemo/pcm-gstreamer.c @@ -397,7 +397,7 @@ void pcm_shutdown_gstreamer(void) g_main_loop_unref (pcm_loop); } -void pcm_postinit(void) +void pcm_play_dma_postinit(void) { } diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c index dfdd90f29b..020928d572 100644 --- a/firmware/target/hosted/sdl/pcm-sdl.c +++ b/firmware/target/hosted/sdl/pcm-sdl.c @@ -410,7 +410,7 @@ void pcm_play_dma_init(void) pcm_dma_apply_settings_nolock(); } -void pcm_postinit(void) +void pcm_play_dma_postinit(void) { } diff --git a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c index cfc3c9ef8e..1ed413c9ae 100644 --- a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c @@ -33,7 +33,7 @@ ** Playback DMA transfer **/ -void pcm_postinit(void) +void pcm_play_dma_postinit(void) { audiohw_postinit(); -- cgit v1.2.3