diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-09-01 12:15:43 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-09-01 12:15:43 +0000 |
commit | 4db3e8965270dfe813a14c5ee9bcd0b645eb2edf (patch) | |
tree | ff785e25196226037c509428497b95f0e1e219b9 /firmware/target/arm | |
parent | d67d6a8462e02770d81d6a01f3193d0a2050fbe2 (diff) | |
download | rockbox-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.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/pcm-pp.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/pcm-telechips.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/pcm-pnx0101.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/pcm-s5l8700.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8702/pcm-s5l8702.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c | 2 |
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) | |||
181 | audiohw_preinit(); | 181 | audiohw_preinit(); |
182 | } | 182 | } |
183 | 183 | ||
184 | void pcm_postinit(void) | 184 | void pcm_play_dma_postinit(void) |
185 | { | 185 | { |
186 | audiohw_postinit(); | 186 | audiohw_postinit(); |
187 | } | 187 | } |
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) | |||
247 | audiohw_init(); | 247 | audiohw_init(); |
248 | } | 248 | } |
249 | 249 | ||
250 | void pcm_postinit(void) | 250 | void pcm_play_dma_postinit(void) |
251 | { | 251 | { |
252 | audiohw_postinit(); | 252 | audiohw_postinit(); |
253 | } | 253 | } |
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) | |||
527 | IISCONFIG |= IIS_TXFIFOEN; | 527 | IISCONFIG |= IIS_TXFIFOEN; |
528 | } | 528 | } |
529 | 529 | ||
530 | void pcm_postinit(void) | 530 | void void pcm_play_dma_postinit(void) |
531 | { | 531 | { |
532 | audiohw_postinit(); | 532 | audiohw_postinit(); |
533 | } | 533 | } |
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 = | |||
57 | .state = 0 | 57 | .state = 0 |
58 | }; | 58 | }; |
59 | 59 | ||
60 | void pcm_postinit(void) | ||
61 | { | ||
62 | audiohw_postinit(); | ||
63 | } | ||
64 | |||
65 | const void * pcm_play_dma_get_peak_buffer(int *count) | 60 | const void * pcm_play_dma_get_peak_buffer(int *count) |
66 | { | 61 | { |
67 | unsigned long addr = (unsigned long)dma_play_data.p; | 62 | unsigned long addr = (unsigned long)dma_play_data.p; |
@@ -110,6 +105,11 @@ void pcm_play_dma_init(void) | |||
110 | #endif | 105 | #endif |
111 | } | 106 | } |
112 | 107 | ||
108 | void pcm_play_dma_postinit(void) | ||
109 | { | ||
110 | audiohw_postinit(); | ||
111 | } | ||
112 | |||
113 | void pcm_dma_apply_settings(void) | 113 | void pcm_dma_apply_settings(void) |
114 | { | 114 | { |
115 | } | 115 | } |
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) | |||
190 | DMAR10(1) |= 1; | 190 | DMAR10(1) |= 1; |
191 | } | 191 | } |
192 | 192 | ||
193 | void pcm_postinit(void) | 193 | void pcm_play_dma_postinit(void) |
194 | { | 194 | { |
195 | audiohw_postinit(); | 195 | audiohw_postinit(); |
196 | } | 196 | } |
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) | |||
94 | bitset32(&INTMOD, DMA2_MASK); | 94 | bitset32(&INTMOD, DMA2_MASK); |
95 | } | 95 | } |
96 | 96 | ||
97 | void pcm_postinit(void) | 97 | void pcm_play_dma_postinit(void) |
98 | { | 98 | { |
99 | audiohw_postinit(); | 99 | audiohw_postinit(); |
100 | } | 100 | } |
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) | |||
120 | bitset32(&INTMOD, DMA2_MASK); | 120 | bitset32(&INTMOD, DMA2_MASK); |
121 | } | 121 | } |
122 | 122 | ||
123 | void pcm_postinit(void) | 123 | void pcm_play_dma_postinit(void) |
124 | { | 124 | { |
125 | audiohw_postinit(); | 125 | audiohw_postinit(); |
126 | } | 126 | } |
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) | |||
262 | audiohw_preinit(); | 262 | audiohw_preinit(); |
263 | } | 263 | } |
264 | 264 | ||
265 | void pcm_postinit(void) | 265 | void pcm_play_dma_postinit(void) |
266 | { | 266 | { |
267 | audiohw_postinit(); | 267 | audiohw_postinit(); |
268 | } | 268 | } |
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) | |||
152 | audiohw_preinit(); | 152 | audiohw_preinit(); |
153 | } | 153 | } |
154 | 154 | ||
155 | void pcm_postinit(void) | 155 | void pcm_play_dma_postinit(void) |
156 | { | 156 | { |
157 | audiohw_postinit(); | 157 | audiohw_postinit(); |
158 | } | 158 | } |
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) | |||
44 | // dsp_init(); | 44 | // dsp_init(); |
45 | } | 45 | } |
46 | 46 | ||
47 | void pcm_postinit(void) | 47 | void pcm_play_dma_postinit(void) |
48 | { | 48 | { |
49 | audiohw_postinit(); | 49 | audiohw_postinit(); |
50 | 50 | ||
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 @@ | |||
35 | */ | 35 | */ |
36 | static void *start; | 36 | static void *start; |
37 | 37 | ||
38 | void pcm_postinit(void) | 38 | void pcm_play_dma_postinit(void) |
39 | { | 39 | { |
40 | /* Configure clock divider */ | 40 | /* Configure clock divider */ |
41 | tsc2100_writereg(CONTROL_PAGE2, TSPP1_ADDRESS, 0x1120); | 41 | tsc2100_writereg(CONTROL_PAGE2, TSPP1_ADDRESS, 0x1120); |