summaryrefslogtreecommitdiff
path: root/firmware
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
parent40ec54305250e9a4a5e54a293abb974121d4a110 (diff)
Fix SVN properties
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19482 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--[-rwxr-xr-x]firmware/SOURCES0
-rw-r--r--[-rwxr-xr-x]firmware/export/config-ondavx747.h0
-rw-r--r--[-rwxr-xr-x]firmware/export/config-ondavx747p.h0
-rw-r--r--[-rwxr-xr-x]firmware/export/config-ondavx767.h0
-rw-r--r--[-rwxr-xr-x]firmware/export/config.h0
-rw-r--r--[-rwxr-xr-x]firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c9
-rw-r--r--[-rwxr-xr-x]firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h0
7 files changed, 4 insertions, 5 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 711a7c0c56..711a7c0c56 100755..100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h
index 2856e7e16d..2856e7e16d 100755..100644
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config-ondavx747.h
diff --git a/firmware/export/config-ondavx747p.h b/firmware/export/config-ondavx747p.h
index 5c4d3e7aea..5c4d3e7aea 100755..100644
--- a/firmware/export/config-ondavx747p.h
+++ b/firmware/export/config-ondavx747p.h
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h
index 7216ef0d35..7216ef0d35 100755..100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config-ondavx767.h
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 75aa76a898..75aa76a898 100755..100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
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)
bat_val = 0;
REG_SADC_ENA |= SADC_ENA_PBATEN;
- /* Primitive wakeup event */
+ /* primitive wakeup event */
while(bat_val == 0)
yield();
@@ -256,6 +256,7 @@ void SADC(void)
REG_SADC_CTRL |= (SADC_CTRL_PENDM);
pen_down = true;
}
+
if(state & SADC_CTRL_PENUM)
{
/* Pen up IRQ */
@@ -265,6 +266,7 @@ void SADC(void)
datacount = 0;
cur_touch = 0;
}
+
if(state & SADC_CTRL_TSRDYM)
{
unsigned int dat;
@@ -306,13 +308,10 @@ void SADC(void)
datacount = 0;
}
}
+
if(state & SADC_CTRL_PBATRDYM)
{
bat_val = REG_SADC_BATDAT;
/* Battery AD IRQ */
}
- if(state & SADC_CTRL_SRDYM)
- {
- /* SADC AD IRQ */
- }
}
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
index 887d7415d0..887d7415d0 100755..100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h