diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-12 12:46:57 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-12 12:46:57 +0000 |
commit | b6e78acc5eb9a5e0586ccd5af3d93c1f5a83fdbc (patch) | |
tree | 329bdd805988a6b9412c768eaa5979baeebdfdb4 /firmware | |
parent | 4bbaef6fd50be130e2232770eee46f975817313d (diff) | |
download | rockbox-b6e78acc5eb9a5e0586ccd5af3d93c1f5a83fdbc.tar.gz rockbox-b6e78acc5eb9a5e0586ccd5af3d93c1f5a83fdbc.zip |
Get rid of some pcm_apply_settings cruft at the low level I somehow missed. Move the ones in pcm.c around to better spots. Remove a variable from pcm-pnx0101.c that should no longer be there.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19402 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/pcm.c | 25 | ||||
-rw-r--r-- | firmware/target/arm/as3525/pcm-as3525.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/pcm-pp.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/pcm-telechips.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/pcm-pnx0101.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c | 1 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c | 2 |
9 files changed, 11 insertions, 37 deletions
diff --git a/firmware/pcm.c b/firmware/pcm.c index ea451a0b9f..0b5b49ebab 100644 --- a/firmware/pcm.c +++ b/firmware/pcm.c | |||
@@ -213,6 +213,7 @@ static void pcm_play_data_start(unsigned char *start, size_t size) | |||
213 | if (start && size) | 213 | if (start && size) |
214 | { | 214 | { |
215 | logf(" pcm_play_dma_start"); | 215 | logf(" pcm_play_dma_start"); |
216 | pcm_apply_settings(); | ||
216 | pcm_play_dma_start(start, size); | 217 | pcm_play_dma_start(start, size); |
217 | pcm_playing = true; | 218 | pcm_playing = true; |
218 | pcm_paused = false; | 219 | pcm_paused = false; |
@@ -234,8 +235,6 @@ void pcm_play_data(pcm_more_callback_type get_more, | |||
234 | 235 | ||
235 | pcm_callback_for_more = get_more; | 236 | pcm_callback_for_more = get_more; |
236 | 237 | ||
237 | pcm_apply_settings(); | ||
238 | |||
239 | logf(" pcm_play_data_start"); | 238 | logf(" pcm_play_data_start"); |
240 | pcm_play_data_start(start, size); | 239 | pcm_play_data_start(start, size); |
241 | 240 | ||
@@ -256,21 +255,17 @@ void pcm_play_pause(bool play) | |||
256 | pcm_play_dma_pause(true); | 255 | pcm_play_dma_pause(true); |
257 | pcm_paused = true; | 256 | pcm_paused = true; |
258 | } | 257 | } |
259 | else | 258 | else if (pcm_get_bytes_waiting() > 0) |
260 | { | 259 | { |
260 | logf(" pcm_play_dma_pause"); | ||
261 | pcm_apply_settings(); | 261 | pcm_apply_settings(); |
262 | 262 | pcm_play_dma_pause(false); | |
263 | if (pcm_get_bytes_waiting() > 0) | 263 | pcm_paused = false; |
264 | { | 264 | } |
265 | logf(" pcm_play_dma_pause"); | 265 | else |
266 | pcm_play_dma_pause(false); | 266 | { |
267 | pcm_paused = false; | 267 | logf(" pcm_play_dma_start: no data"); |
268 | } | 268 | pcm_play_data_start(NULL, 0); |
269 | else | ||
270 | { | ||
271 | logf(" pcm_play_dma_start: no data"); | ||
272 | pcm_play_data_start(NULL, 0); | ||
273 | } | ||
274 | } | 269 | } |
275 | } | 270 | } |
276 | else | 271 | else |
diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c index fe694e0967..4df31db376 100644 --- a/firmware/target/arm/as3525/pcm-as3525.c +++ b/firmware/target/arm/as3525/pcm-as3525.c | |||
@@ -135,7 +135,6 @@ void pcm_play_dma_init(void) | |||
135 | void pcm_postinit(void) | 135 | void pcm_postinit(void) |
136 | { | 136 | { |
137 | audiohw_postinit(); | 137 | audiohw_postinit(); |
138 | pcm_apply_settings(); | ||
139 | } | 138 | } |
140 | 139 | ||
141 | void pcm_dma_apply_settings(void) | 140 | void pcm_dma_apply_settings(void) |
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c index 48f7f608d9..d0f93eedd5 100644 --- a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c | |||
@@ -206,9 +206,6 @@ static void play_start_pcm(void) | |||
206 | /* Stop transmission (if in progress) */ | 206 | /* Stop transmission (if in progress) */ |
207 | SSI_SCR1 &= ~SSI_SCR_TE; | 207 | SSI_SCR1 &= ~SSI_SCR_TE; |
208 | 208 | ||
209 | /* Apply new settings */ | ||
210 | pcm_apply_settings(); | ||
211 | |||
212 | /* Enable interrupt on unlock */ | 209 | /* Enable interrupt on unlock */ |
213 | dma_play_data.state = 1; | 210 | dma_play_data.state = 1; |
214 | 211 | ||
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c index e00b1d7e75..0f87a74d1c 100644 --- a/firmware/target/arm/pcm-pp.c +++ b/firmware/target/arm/pcm-pp.c | |||
@@ -272,8 +272,6 @@ static void play_start_pcm(void) | |||
272 | { | 272 | { |
273 | fiq_function = fiq_playback; | 273 | fiq_function = fiq_playback; |
274 | 274 | ||
275 | pcm_apply_settings(); | ||
276 | |||
277 | IISCONFIG &= ~IIS_TXFIFOEN; /* Stop transmitting */ | 275 | IISCONFIG &= ~IIS_TXFIFOEN; /* Stop transmitting */ |
278 | dma_play_data.state = 1; | 276 | dma_play_data.state = 1; |
279 | 277 | ||
@@ -379,7 +377,6 @@ void pcm_play_dma_init(void) | |||
379 | void pcm_postinit(void) | 377 | void pcm_postinit(void) |
380 | { | 378 | { |
381 | audiohw_postinit(); | 379 | audiohw_postinit(); |
382 | pcm_apply_settings(); | ||
383 | } | 380 | } |
384 | 381 | ||
385 | const void * pcm_play_dma_get_peak_buffer(int *count) | 382 | const void * pcm_play_dma_get_peak_buffer(int *count) |
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c index 823eb3a3a5..06f6638e54 100644 --- a/firmware/target/arm/pcm-telechips.c +++ b/firmware/target/arm/pcm-telechips.c | |||
@@ -61,7 +61,6 @@ struct dma_data dma_play_data SHAREDBSS_ATTR = | |||
61 | void pcm_postinit(void) | 61 | void pcm_postinit(void) |
62 | { | 62 | { |
63 | audiohw_postinit(); | 63 | audiohw_postinit(); |
64 | pcm_apply_settings(); | ||
65 | } | 64 | } |
66 | 65 | ||
67 | const void * pcm_play_dma_get_peak_buffer(int *count) | 66 | const void * pcm_play_dma_get_peak_buffer(int *count) |
@@ -115,8 +114,6 @@ void pcm_dma_apply_settings(void) | |||
115 | 114 | ||
116 | static void play_start_pcm(void) | 115 | static void play_start_pcm(void) |
117 | { | 116 | { |
118 | pcm_apply_settings(); | ||
119 | |||
120 | DAMR &= ~(1<<14); /* disable tx */ | 117 | DAMR &= ~(1<<14); /* disable tx */ |
121 | dma_play_data.state = 1; | 118 | dma_play_data.state = 1; |
122 | 119 | ||
diff --git a/firmware/target/arm/pnx0101/pcm-pnx0101.c b/firmware/target/arm/pnx0101/pcm-pnx0101.c index 20fca48039..9d0f76b0a3 100644 --- a/firmware/target/arm/pnx0101/pcm-pnx0101.c +++ b/firmware/target/arm/pnx0101/pcm-pnx0101.c | |||
@@ -27,8 +27,6 @@ | |||
27 | short __attribute__((section(".dmabuf"))) dma_buf_left[DMA_BUF_SAMPLES]; | 27 | short __attribute__((section(".dmabuf"))) dma_buf_left[DMA_BUF_SAMPLES]; |
28 | short __attribute__((section(".dmabuf"))) dma_buf_right[DMA_BUF_SAMPLES]; | 28 | short __attribute__((section(".dmabuf"))) dma_buf_right[DMA_BUF_SAMPLES]; |
29 | 29 | ||
30 | static int pcm_sampr = HW_SAMPR_DEFAULT; /* 44.1 is default */ | ||
31 | |||
32 | unsigned short* p IBSS_ATTR; | 30 | unsigned short* p IBSS_ATTR; |
33 | size_t p_size IBSS_ATTR; | 31 | size_t p_size IBSS_ATTR; |
34 | 32 | ||
@@ -42,8 +40,6 @@ void pcm_play_unlock(void) | |||
42 | 40 | ||
43 | void pcm_play_dma_start(const void *addr, size_t size) | 41 | void pcm_play_dma_start(const void *addr, size_t size) |
44 | { | 42 | { |
45 | pcm_apply_settings(); | ||
46 | |||
47 | p = (unsigned short*)addr; | 43 | p = (unsigned short*)addr; |
48 | p_size = size; | 44 | p_size = size; |
49 | } | 45 | } |
@@ -54,8 +50,7 @@ void pcm_play_dma_stop(void) | |||
54 | 50 | ||
55 | void pcm_play_dma_pause(bool pause) | 51 | void pcm_play_dma_pause(bool pause) |
56 | { | 52 | { |
57 | if (!pause) | 53 | (void)pause; |
58 | pcm_apply_settings(); | ||
59 | } | 54 | } |
60 | 55 | ||
61 | static inline void fill_dma_buf(int offset) | 56 | static inline void fill_dma_buf(int offset) |
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 315fc3bf0f..fbf4547e53 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | |||
@@ -96,7 +96,6 @@ void pcm_play_dma_init(void) | |||
96 | void pcm_postinit(void) | 96 | void pcm_postinit(void) |
97 | { | 97 | { |
98 | audiohw_postinit(); | 98 | audiohw_postinit(); |
99 | pcm_apply_settings(); | ||
100 | } | 99 | } |
101 | 100 | ||
102 | void pcm_dma_apply_settings(void) | 101 | void pcm_dma_apply_settings(void) |
@@ -110,8 +109,6 @@ static void play_start_pcm(void) | |||
110 | /* clear pending DMA interrupt */ | 109 | /* clear pending DMA interrupt */ |
111 | SRCPND = DMA2_MASK; | 110 | SRCPND = DMA2_MASK; |
112 | 111 | ||
113 | pcm_apply_settings(); | ||
114 | |||
115 | /* Flush any pending writes */ | 112 | /* Flush any pending writes */ |
116 | clean_dcache_range((void*)DISRC2, (DCON2 & 0xFFFFF) * 2); | 113 | clean_dcache_range((void*)DISRC2, (DCON2 & 0xFFFFF) * 2); |
117 | 114 | ||
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c index 9e2e73e0fc..b51139e7e6 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c | |||
@@ -46,7 +46,6 @@ void pcm_play_dma_init(void) | |||
46 | void pcm_postinit(void) | 46 | void pcm_postinit(void) |
47 | { | 47 | { |
48 | audiohw_postinit(); | 48 | audiohw_postinit(); |
49 | pcm_apply_settings(); | ||
50 | 49 | ||
51 | /* wake DSP */ | 50 | /* wake DSP */ |
52 | dsp_wake(); | 51 | dsp_wake(); |
diff --git a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c index 2d3aa45d08..dce989d81f 100644 --- a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c | |||
@@ -39,8 +39,6 @@ void pcm_postinit(void) | |||
39 | /* playback sample:16 bits, burst:16 bytes */ | 39 | /* playback sample:16 bits, burst:16 bytes */ |
40 | __i2s_set_transmit_trigger(4); | 40 | __i2s_set_transmit_trigger(4); |
41 | __i2s_set_oss_sample_size(16); | 41 | __i2s_set_oss_sample_size(16); |
42 | |||
43 | pcm_apply_settings(); | ||
44 | } | 42 | } |
45 | 43 | ||
46 | const void * pcm_play_dma_get_peak_buffer(int *count) | 44 | const void * pcm_play_dma_get_peak_buffer(int *count) |