summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2006-06-03 08:56:58 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2006-06-03 08:56:58 +0000
commit9ae0c957c8749bba29caea3dc0be37582f6b56b4 (patch)
tree023a2791ea2e9656f66266b8cf091ddb6e25c14d
parentca8fa65ab7489e3bfca84af8fb242e60846c6412 (diff)
downloadrockbox-9ae0c957c8749bba29caea3dc0be37582f6b56b4.tar.gz
rockbox-9ae0c957c8749bba29caea3dc0be37582f6b56b4.zip
Remove previous fix as it seems to cause lock-ups when used with a remote.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10037 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/uda1380.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/drivers/uda1380.c b/firmware/drivers/uda1380.c
index 322078a5f5..68a3df5491 100644
--- a/firmware/drivers/uda1380.c
+++ b/firmware/drivers/uda1380.c
@@ -265,7 +265,7 @@ void uda1380_disable_recording(void)
265void uda1380_set_recvol(int left, int right, int type) 265void uda1380_set_recvol(int left, int right, int type)
266{ 266{
267 int left_ag, right_ag; 267 int left_ag, right_ag;
268 int old_irq_level; 268 /*int old_irq_level;*/
269 269
270 switch (type) 270 switch (type)
271 { 271 {
@@ -273,11 +273,11 @@ void uda1380_set_recvol(int left, int right, int type)
273 left_ag = MIN(MAX(0, left / 4), 15); 273 left_ag = MIN(MAX(0, left / 4), 15);
274 left -= left_ag * 4; 274 left -= left_ag * 4;
275 /* allow nothing in between the two calls */ 275 /* allow nothing in between the two calls */
276 old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); 276 /*old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL);*/
277 uda1380_write_reg(REG_ADC, (uda1380_regs[REG_ADC] & ~VGA_GAIN_MASK) 277 uda1380_write_reg(REG_ADC, (uda1380_regs[REG_ADC] & ~VGA_GAIN_MASK)
278 | VGA_GAIN(left_ag)); 278 | VGA_GAIN(left_ag));
279 uda1380_write_reg(REG_DEC_VOL, DEC_VOLL(left) | DEC_VOLR(left)); 279 uda1380_write_reg(REG_DEC_VOL, DEC_VOLL(left) | DEC_VOLR(left));
280 set_irq_level(old_irq_level); 280 /*set_irq_level(old_irq_level);*/
281 logf("Mic: %dA/%dD", left_ag, left); 281 logf("Mic: %dA/%dD", left_ag, left);
282 break; 282 break;
283 283
@@ -287,11 +287,11 @@ void uda1380_set_recvol(int left, int right, int type)
287 right_ag = MIN(MAX(0, right / 6), 8); 287 right_ag = MIN(MAX(0, right / 6), 8);
288 right -= right_ag * 6; 288 right -= right_ag * 6;
289 /* allow nothing in between the two calls */ 289 /* allow nothing in between the two calls */
290 old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); 290 /*old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL);*/
291 uda1380_write_reg(REG_PGA, (uda1380_regs[REG_PGA] & ~PGA_GAIN_MASK) 291 uda1380_write_reg(REG_PGA, (uda1380_regs[REG_PGA] & ~PGA_GAIN_MASK)
292 | PGA_GAINL(left_ag) | PGA_GAINR(right_ag)); 292 | PGA_GAINL(left_ag) | PGA_GAINR(right_ag));
293 uda1380_write_reg(REG_DEC_VOL, DEC_VOLL(left) | DEC_VOLR(right)); 293 uda1380_write_reg(REG_DEC_VOL, DEC_VOLL(left) | DEC_VOLR(right));
294 set_irq_level(old_irq_level); 294 /*set_irq_level(old_irq_level);*/
295 logf("Line L: %dA/%dD", left_ag, left); 295 logf("Line L: %dA/%dD", left_ag, left);
296 logf("Line R: %dA/%dD", right_ag, right); 296 logf("Line R: %dA/%dD", right_ag, right);
297 break; 297 break;