summaryrefslogtreecommitdiff
path: root/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2009-12-12 18:36:52 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2009-12-12 18:36:52 +0000
commite087751b107982eeaa001e92c2dd1f24f1af6809 (patch)
tree05b984cc09e7e268d1885d9ee06c7274fbc4b4e2 /firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
parentde159ceb3d1b852ee97be15ae707056ec995bf2d (diff)
downloadrockbox-e087751b107982eeaa001e92c2dd1f24f1af6809.tar.gz
rockbox-e087751b107982eeaa001e92c2dd1f24f1af6809.zip
M:Robe 500: Fix FIQ's and make the audio DMA a FIQ, simplify the ADC code and make it more reliable. Fix ADC problems on initial boot.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23948 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c')
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
index 6e361aac15..d0f1a0bf59 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
@@ -68,17 +68,14 @@ unsigned int battery_adc_voltage(void)
68 current_bat2=((short)((int)(bat2<<10)/4096*6*2.5)); 68 current_bat2=((short)((int)(bat2<<10)/4096*6*2.5));
69 current_aux=((short)((int)(aux<<10)/4096*6*2.5)); 69 current_aux=((short)((int)(aux<<10)/4096*6*2.5));
70 } 70 }
71 71
72 if (TIME_BEFORE(last_tick+2*HZ, current_tick) || last_tick==0) 72 tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS);
73
74 /* Set the TSC2100 to read voltages if not busy with pen */
75 if(!(tsadc & TSADC_PSTCM))
73 { 76 {
74 tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS); 77 tsc2100_set_mode(true, 0x0B);
75 78 last_tick = current_tick;
76 /* Set the TSC2100 to read voltages if not busy with pen */
77 if(!(tsadc & TSADC_PSTCM))
78 {
79 tsc2100_set_mode(true, 0x0B);
80 last_tick = current_tick;
81 }
82 } 79 }
83 80
84 return current_voltage; 81 return current_voltage;