summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c4
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c68
2 files changed, 36 insertions, 36 deletions
diff --git a/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c b/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
index 33bbb6af48..8090c624df 100644
--- a/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
@@ -26,8 +26,8 @@
26 26
27#define SMLAL(lo, hi, x, y) \ 27#define SMLAL(lo, hi, x, y) \
28 asm volatile ("smlal %0, %1, %2, %3" \ 28 asm volatile ("smlal %0, %1, %2, %3" \
29 : "+r" (lo), "+r" (hi) \ 29 : "+r" (lo), "+r" (hi) \
30 : "%r" (x), "r" (y)) 30 : "%r" (x), "r" (y))
31 31
32const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = 32const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
33{ 33{
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index 02294100ac..ab3ceba0f3 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -37,7 +37,7 @@ static size_t size;
37 37
38void pcm_postinit(void) 38void pcm_postinit(void)
39{ 39{
40 audiohw_postinit(); 40 audiohw_postinit();
41} 41}
42 42
43/* Return the current location in the SDRAM to SARAM transfer along with the 43/* Return the current location in the SDRAM to SARAM transfer along with the
@@ -48,7 +48,7 @@ void pcm_postinit(void)
48 */ 48 */
49const void * pcm_play_dma_get_peak_buffer(int *count) 49const void * pcm_play_dma_get_peak_buffer(int *count)
50{ 50{
51 int cnt = DSP_(_sdem_level); 51 int cnt = DSP_(_sdem_level);
52 52
53 unsigned long addr = (unsigned long) start +cnt; 53 unsigned long addr = (unsigned long) start +cnt;
54 54
@@ -73,7 +73,7 @@ void pcm_play_dma_init(void)
73 73
74void pcm_dma_apply_settings(void) 74void pcm_dma_apply_settings(void)
75{ 75{
76 audiohw_set_frequency(pcm_fsel); 76 audiohw_set_frequency(pcm_fsel);
77} 77}
78 78
79/* Note that size is actually limited to the size of a short right now due to 79/* Note that size is actually limited to the size of a short right now due to
@@ -81,7 +81,7 @@ void pcm_dma_apply_settings(void)
81 */ 81 */
82void pcm_play_dma_start(const void *addr, size_t size) 82void pcm_play_dma_start(const void *addr, size_t size)
83{ 83{
84 unsigned long sdem_addr=(unsigned long)addr - CONFIG_SDRAM_START; 84 unsigned long sdem_addr=(unsigned long)addr - CONFIG_SDRAM_START;
85 /* Initialize codec. */ 85 /* Initialize codec. */
86 DSP_(_sdem_addrl) = sdem_addr & 0xffff; 86 DSP_(_sdem_addrl) = sdem_addr & 0xffff;
87 DSP_(_sdem_addrh) = sdem_addr >> 16; 87 DSP_(_sdem_addrh) = sdem_addr >> 16;
@@ -116,7 +116,7 @@ void pcm_play_dma_pause(bool pause)
116 } 116 }
117 else 117 else
118 { 118 {
119 DSP_(_dma0_stopped)=0; 119 DSP_(_dma0_stopped)=0;
120 dsp_wake(); 120 dsp_wake();
121 } 121 }
122} 122}
@@ -132,8 +132,8 @@ char buffer[80];
132void DSPHINT(void) __attribute__ ((section(".icode"))); 132void DSPHINT(void) __attribute__ ((section(".icode")));
133void DSPHINT(void) 133void DSPHINT(void)
134{ 134{
135 register pcm_more_callback_type get_more; /* No stack for this */ 135 register pcm_more_callback_type get_more; /* No stack for this */
136 136
137 unsigned int i; 137 unsigned int i;
138 138
139 IO_INTC_FIQ0 = 1 << 11; 139 IO_INTC_FIQ0 = 1 << 11;
@@ -151,35 +151,35 @@ void DSPHINT(void)
151 break; 151 break;
152 152
153 case MSG_REFILL: 153 case MSG_REFILL:
154 /* Buffer empty. Try to get more. */ 154 /* Buffer empty. Try to get more. */
155 get_more = pcm_callback_for_more; 155 get_more = pcm_callback_for_more;
156 size = 0; 156 size = 0;
157 157
158 if (get_more == NULL || (get_more(&start, &size), size == 0)) 158 if (get_more == NULL || (get_more(&start, &size), size == 0))
159 { 159 {
160 /* Callback missing or no more DMA to do */ 160 /* Callback missing or no more DMA to do */
161 pcm_play_dma_stop(); 161 pcm_play_dma_stop();
162 pcm_play_dma_stopped_callback(); 162 pcm_play_dma_stopped_callback();
163 } 163 }
164 164
165 { 165 {
166 unsigned long sdem_addr=(unsigned long)start - CONFIG_SDRAM_START; 166 unsigned long sdem_addr=(unsigned long)start - CONFIG_SDRAM_START;
167 /* Flush any pending cache writes */ 167 /* Flush any pending cache writes */
168 clean_dcache_range(start, size); 168 clean_dcache_range(start, size);
169 169
170 /* set the new DMA values */ 170 /* set the new DMA values */
171 DSP_(_sdem_addrl) = sdem_addr & 0xffff; 171 DSP_(_sdem_addrl) = sdem_addr & 0xffff;
172 DSP_(_sdem_addrh) = sdem_addr >> 16; 172 DSP_(_sdem_addrh) = sdem_addr >> 16;
173 DSP_(_sdem_dsp_size) = size; 173 DSP_(_sdem_dsp_size) = size;
174 174
175 DEBUGF("pcm_sdram at 0x%08lx, sdem_addr 0x%08lx", 175 DEBUGF("pcm_sdram at 0x%08lx, sdem_addr 0x%08lx",
176 (unsigned long)start, (unsigned long)sdem_addr); 176 (unsigned long)start, (unsigned long)sdem_addr);
177 } 177 }
178 178
179 break; 179 break;
180 default: 180 default:
181 DEBUGF("DSP: unknown msg 0x%04x", dsp_message.msg); 181 DEBUGF("DSP: unknown msg 0x%04x", dsp_message.msg);
182 break; 182 break;
183 } 183 }
184 184
185 /* Re-Activate the channel */ 185 /* Re-Activate the channel */