summaryrefslogtreecommitdiff
path: root/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-12-19 11:29:18 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-12-19 11:29:18 +0000
commit9da2456c2677ca074c35e0dd84837c3c32798cc0 (patch)
tree13fd1d06cf9f93f6f5e32091991789c7483fa3d5 /firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
parent40ec54305250e9a4a5e54a293abb974121d4a110 (diff)
downloadrockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.tar.gz
rockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.zip
Fix SVN properties
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19482 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c')
-rw-r--r--[-rwxr-xr-x]firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
index 1aa98819fe..0271fd1b96 100755..100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
@@ -115,7 +115,7 @@ unsigned int battery_adc_voltage(void)
115 bat_val = 0; 115 bat_val = 0;
116 REG_SADC_ENA |= SADC_ENA_PBATEN; 116 REG_SADC_ENA |= SADC_ENA_PBATEN;
117 117
118 /* Primitive wakeup event */ 118 /* primitive wakeup event */
119 while(bat_val == 0) 119 while(bat_val == 0)
120 yield(); 120 yield();
121 121
@@ -256,6 +256,7 @@ void SADC(void)
256 REG_SADC_CTRL |= (SADC_CTRL_PENDM); 256 REG_SADC_CTRL |= (SADC_CTRL_PENDM);
257 pen_down = true; 257 pen_down = true;
258 } 258 }
259
259 if(state & SADC_CTRL_PENUM) 260 if(state & SADC_CTRL_PENUM)
260 { 261 {
261 /* Pen up IRQ */ 262 /* Pen up IRQ */
@@ -265,6 +266,7 @@ void SADC(void)
265 datacount = 0; 266 datacount = 0;
266 cur_touch = 0; 267 cur_touch = 0;
267 } 268 }
269
268 if(state & SADC_CTRL_TSRDYM) 270 if(state & SADC_CTRL_TSRDYM)
269 { 271 {
270 unsigned int dat; 272 unsigned int dat;
@@ -306,13 +308,10 @@ void SADC(void)
306 datacount = 0; 308 datacount = 0;
307 } 309 }
308 } 310 }
311
309 if(state & SADC_CTRL_PBATRDYM) 312 if(state & SADC_CTRL_PBATRDYM)
310 { 313 {
311 bat_val = REG_SADC_BATDAT; 314 bat_val = REG_SADC_BATDAT;
312 /* Battery AD IRQ */ 315 /* Battery AD IRQ */
313 } 316 }
314 if(state & SADC_CTRL_SRDYM)
315 {
316 /* SADC AD IRQ */
317 }
318} 317}