summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2021-07-25 14:03:44 +0100
committerAidan MacDonald <amachronic@protonmail.com>2021-07-25 14:07:41 +0000
commite532714d1f76ccdbd1dcfeb3b4579d324cb519c1 (patch)
tree588252314fd7910c49b60cece106d2c23e6fcef6 /firmware/target/arm
parent77ec7522485c0bf1f48669d6eca0d09366c3bbd7 (diff)
downloadrockbox-e532714d1f76ccdbd1dcfeb3b4579d324cb519c1.tar.gz
rockbox-e532714d1f76ccdbd1dcfeb3b4579d324cb519c1.zip
pcm: Remove unused function pcm_play_dma_get_peak_buffer()
Change-Id: Ifd20fb14a22489cdb99154c01f69809a1e70d0c5
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/pcm-as3525.c12
-rw-r--r--firmware/target/arm/imx233/pcm-imx233.c11
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c28
-rw-r--r--firmware/target/arm/pcm-telechips.c8
-rw-r--r--firmware/target/arm/pp/pcm-pp.c13
-rw-r--r--firmware/target/arm/rk27xx/pcm-rk27xx.c12
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c8
-rw-r--r--firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c8
-rw-r--r--firmware/target/arm/s5l8700/pcm-s5l8700.c6
-rw-r--r--firmware/target/arm/s5l8702/pcm-s5l8702.c7
-rw-r--r--firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c6
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c16
-rw-r--r--firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c16
13 files changed, 0 insertions, 151 deletions
diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c
index dfbda388be..e480140497 100644
--- a/firmware/target/arm/as3525/pcm-as3525.c
+++ b/firmware/target/arm/as3525/pcm-as3525.c
@@ -200,18 +200,6 @@ void pcm_dma_apply_settings(void)
200 0x01ffffff); 200 0x01ffffff);
201} 201}
202 202
203const void * pcm_play_dma_get_peak_buffer(int *count)
204{
205 int oldstatus = disable_irq_save();
206 size_t addr = DMAC_CH_SRC_ADDR(0);
207 size_t start_addr = (size_t)dma_start_addr;
208 size_t start_size = dma_start_size;
209 restore_interrupt(oldstatus);
210
211 *count = (start_size - addr + start_addr) >> 2;
212 return (void*)AS3525_UNCACHED_ADDR(addr);
213}
214
215#ifdef HAVE_PCM_DMA_ADDRESS 203#ifdef HAVE_PCM_DMA_ADDRESS
216void * pcm_dma_addr(void *addr) 204void * pcm_dma_addr(void *addr)
217{ 205{
diff --git a/firmware/target/arm/imx233/pcm-imx233.c b/firmware/target/arm/imx233/pcm-imx233.c
index c06120e4aa..4738485b3d 100644
--- a/firmware/target/arm/imx233/pcm-imx233.c
+++ b/firmware/target/arm/imx233/pcm-imx233.c
@@ -175,17 +175,6 @@ void pcm_dma_apply_settings(void)
175 pcm_play_unlock(); 175 pcm_play_unlock();
176} 176}
177 177
178const void *pcm_play_dma_get_peak_buffer(int *count)
179{
180 if(!dac_freezed)
181 imx233_dma_freeze_channel(APB_AUDIO_DAC, true);
182 struct imx233_dma_info_t info = imx233_dma_get_info(APB_AUDIO_DAC, DMA_INFO_AHB_BYTES | DMA_INFO_BAR);
183 if(!dac_freezed)
184 imx233_dma_freeze_channel(APB_AUDIO_DAC, false);
185 *count = info.ahb_bytes;
186 return (void *)info.bar;
187}
188
189/* 178/*
190 * Recording 179 * Recording
191 */ 180 */
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 13dff6ecb5..955301b4da 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
@@ -224,34 +224,6 @@ void pcm_play_dma_stop(void)
224 play_stop_pcm(); 224 play_stop_pcm();
225} 225}
226 226
227/* Return a pointer to the samples and the number of them in *count */
228const void * pcm_play_dma_get_peak_buffer(int *count)
229{
230 static unsigned long dsa NOCACHEBSS_ATTR;
231 unsigned long addr;
232 long offs, size;
233 int oldstatus;
234
235 /* read burst dma source address register in channel context */
236 sdma_read_words(&dsa, CHANNEL_CONTEXT_ADDR(DMA_PLAY_CH_NUM)+0x0b, 1);
237
238 oldstatus = disable_irq_save();
239 addr = dsa;
240 offs = addr - (unsigned long)dma_play_bd.buf_addr;
241 size = dma_play_bd.mode.count;
242 restore_irq(oldstatus);
243
244 /* Be addresses are coherent (no buffer change during read) */
245 if (offs >= 0 && offs < size)
246 {
247 *count = (size - offs) >> 2;
248 return (void *)((addr + 2) & ~3);
249 }
250
251 *count = 0;
252 return NULL;
253}
254
255void * pcm_dma_addr(void *addr) 227void * pcm_dma_addr(void *addr)
256{ 228{
257 return (void *)addr_virt_to_phys((unsigned long)addr); 229 return (void *)addr_virt_to_phys((unsigned long)addr);
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c
index ff550b14d6..336b5626ca 100644
--- a/firmware/target/arm/pcm-telechips.c
+++ b/firmware/target/arm/pcm-telechips.c
@@ -62,14 +62,6 @@ struct dma_data dma_play_data SHAREDBSS_ATTR =
62 .state = 0 62 .state = 0
63}; 63};
64 64
65const void * pcm_play_dma_get_peak_buffer(int *count)
66{
67 unsigned long addr = (unsigned long)dma_play_data.p;
68 size_t cnt = dma_play_data.size;
69 *count = cnt >> 2;
70 return (void *)((addr + 2) & ~3);
71}
72
73void pcm_play_dma_init(void) 65void pcm_play_dma_init(void)
74{ 66{
75 DAVC = 0x0; /* Digital Volume = max */ 67 DAVC = 0x0; /* Digital Volume = max */
diff --git a/firmware/target/arm/pp/pcm-pp.c b/firmware/target/arm/pp/pcm-pp.c
index 8434123a92..0d61eb44ff 100644
--- a/firmware/target/arm/pp/pcm-pp.c
+++ b/firmware/target/arm/pp/pcm-pp.c
@@ -512,19 +512,6 @@ void pcm_play_dma_postinit(void)
512 audiohw_postinit(); 512 audiohw_postinit();
513} 513}
514 514
515const void * pcm_play_dma_get_peak_buffer(int *count)
516{
517 unsigned long addr, size;
518
519 int status = disable_fiq_save();
520 addr = dma_play_data.addr;
521 size = dma_play_data.size;
522 restore_fiq(status);
523
524 *count = size >> 2;
525 return (void *)((addr + 2) & ~3);
526}
527
528/**************************************************************************** 515/****************************************************************************
529 ** Recording DMA transfer 516 ** Recording DMA transfer
530 **/ 517 **/
diff --git a/firmware/target/arm/rk27xx/pcm-rk27xx.c b/firmware/target/arm/rk27xx/pcm-rk27xx.c
index c0b4c45805..26e3ad87ba 100644
--- a/firmware/target/arm/rk27xx/pcm-rk27xx.c
+++ b/firmware/target/arm/rk27xx/pcm-rk27xx.c
@@ -263,18 +263,6 @@ void INT_HDMA(void)
263 } 263 }
264} 264}
265 265
266const void * pcm_play_dma_get_peak_buffer(int *count)
267{
268 uint32_t addr;
269
270 int old = disable_irq_save();
271 addr = HDMA_CSRC0;
272 *count = ((HDMA_CCNT0 & 0xffff)<<2);
273 restore_interrupt(old);
274
275 return (void*)addr;
276}
277
278/**************************************************************************** 266/****************************************************************************
279 ** Recording DMA transfer 267 ** Recording DMA transfer
280 **/ 268 **/
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 d784180e77..e75c3fe7c6 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
@@ -219,11 +219,3 @@ void fiq_handler(void)
219 219
220 pcm_play_dma_status_callback(PCM_DMAST_STARTED); 220 pcm_play_dma_status_callback(PCM_DMAST_STARTED);
221} 221}
222
223const void * pcm_play_dma_get_peak_buffer(int *count)
224{
225 unsigned long addr = DCSRC2;
226 int cnt = DSTAT2;
227 *count = (cnt & 0xFFFFF) >> 1;
228 return (void *)((addr + 2) & ~3);
229}
diff --git a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
index 9574522586..999a53e3f9 100644
--- a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
+++ b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
@@ -259,11 +259,3 @@ void fiq_handler(void)
259 259
260 pcm_play_dma_status_callback(PCM_DMAST_STARTED); 260 pcm_play_dma_status_callback(PCM_DMAST_STARTED);
261} 261}
262
263const void * pcm_play_dma_get_peak_buffer(int *count)
264{
265 unsigned long addr = DCSRC2;
266 int cnt = DSTAT2;
267 *count = (cnt & 0xFFFFF) >> 1;
268 return (void *)((addr + 2) & ~3);
269}
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 050e14451d..c7b6ed9a03 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -262,12 +262,6 @@ void pcm_dma_apply_settings(void)
262 pcm_dma_set_freq(pcm_fsel); 262 pcm_dma_set_freq(pcm_fsel);
263} 263}
264 264
265const void * pcm_play_dma_get_peak_buffer(int *count)
266{
267 *count = DMACTCNT0 >> 1;
268 return (void *)(((DMACADDR0 + 2) & ~3) | 0x40000000);
269}
270
271#ifdef HAVE_PCM_DMA_ADDRESS 265#ifdef HAVE_PCM_DMA_ADDRESS
272void * pcm_dma_addr(void *addr) 266void * pcm_dma_addr(void *addr)
273{ 267{
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c
index 33fe637770..d4570f3a7f 100644
--- a/firmware/target/arm/s5l8702/pcm-s5l8702.c
+++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c
@@ -216,13 +216,6 @@ void pcm_play_dma_postinit(void)
216 audiohw_postinit(); 216 audiohw_postinit();
217} 217}
218 218
219const void* pcm_play_dma_get_peak_buffer(int *count)
220{
221 void *addr = dmac_ch_get_info(&dma_play_ch, count, NULL);
222 *count >>= 2; /* bytes to samples */
223 return addr; /* aligned to dest burst */
224}
225
226#ifdef HAVE_PCM_DMA_ADDRESS 219#ifdef HAVE_PCM_DMA_ADDRESS
227void * pcm_dma_addr(void *addr) 220void * pcm_dma_addr(void *addr)
228{ 221{
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
index d5e30ad73b..fa1eb2481f 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c
@@ -52,12 +52,6 @@ void pcm_play_dma_postinit(void)
52// dsp_wake(); 52// dsp_wake();
53} 53}
54 54
55const void * pcm_play_dma_get_peak_buffer(int *count)
56{
57 (void) count;
58 return 0;
59}
60
61void pcm_dma_apply_settings(void) 55void pcm_dma_apply_settings(void)
62{ 56{
63 audiohw_set_frequency(pcm_fsel); 57 audiohw_set_frequency(pcm_fsel);
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index 5ce5a8f399..fda8615e5a 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -46,22 +46,6 @@ void pcm_play_dma_postinit(void)
46 audiohw_postinit(); 46 audiohw_postinit();
47} 47}
48 48
49/* Return the current location in the SDRAM to SARAM transfer along with the
50 * number of bytes read in the current buffer (count). There is latency with
51 * this method equivalent to ~ the size of the SARAM buffer since there is
52 * another buffer between your ears and this calculation, but this works for
53 * key clicks and an approximate peak meter.
54 */
55const void * pcm_play_dma_get_peak_buffer(int *count)
56{
57 int cnt = DSP_(_sdem_level);
58
59 unsigned long addr = (unsigned long) start + cnt;
60
61 *count = (cnt & 0xFFFFF) >> 1;
62 return (void *)((addr + 2) & ~3);
63}
64
65void pcm_play_dma_init(void) 49void pcm_play_dma_init(void)
66{ 50{
67 IO_INTC_IRQ0 = INTR_IRQ0_IMGBUF; 51 IO_INTC_IRQ0 = INTR_IRQ0_IMGBUF;
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c
index f9f19a8045..bda000e68f 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c
@@ -42,22 +42,6 @@ void pcm_play_dma_postinit(void)
42 audiohw_postinit(); 42 audiohw_postinit();
43} 43}
44 44
45/* Return the current location in the SDRAM to SARAM transfer along with the
46 * number of bytes read in the current buffer (count). There is latency with
47 * this method equivalent to ~ the size of the SARAM buffer since there is
48 * another buffer between your ears and this calculation, but this works for
49 * key clicks and an approximate peak meter.
50 */
51const void * pcm_play_dma_get_peak_buffer(int *count)
52{
53 int cnt = DSP_(_sdem_level);
54
55 unsigned long addr = (unsigned long) start + cnt;
56
57 *count = (cnt & 0xFFFFF) >> 1;
58 return (void *)((addr + 2) & ~3);
59}
60
61void pcm_play_dma_init(void) 45void pcm_play_dma_init(void)
62{ 46{
63 /* GIO16 is DSP/AIC3X CLK */ 47 /* GIO16 is DSP/AIC3X CLK */