summaryrefslogtreecommitdiff
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
parent40ec54305250e9a4a5e54a293abb974121d4a110 (diff)
downloadrockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.zip
rockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.tar.gz
rockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.tar.bz2
rockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.tar.xz
Fix SVN properties
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19482 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--[-rwxr-xr-x]bootloader/SOURCES0
-rw-r--r--[-rwxr-xr-x]bootloader/ondavx747.c9
-rw-r--r--[-rwxr-xr-x]docs/CREDITS0
-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
10 files changed, 6 insertions, 12 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 693644d..693644d 100755..100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index 0695dc0..09acbc8 100755..100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -29,13 +29,13 @@
#include "lcd.h"
#include "ata.h"
#include "usb.h"
-#include "storage.h"
#include "system.h"
#include "button.h"
#include "timefuncs.h"
#include "rtc.h"
#include "common.h"
#include "mipsregs.h"
+#include "storage.h"
#ifdef ONDA_VX747P
#define ONDA_VX747
@@ -112,19 +112,14 @@ int main(void)
KNOP(BUTTON_POWER, 3);
lcd_set_foreground(LCD_WHITE);
if(button_hold())
- {
printf("BUTTON_HOLD");
- asm("break 0x7");
- }
if(btn & BUTTON_POWER)
- {
power_off();
- }
#ifdef ONDA_VX747
if(btn & BUTTON_TOUCH)
{
lcd_set_foreground(LCD_RGBPACK(touch & 0xFF, (touch >> 8)&0xFF, (touch >> 16)&0xFF));
- lcd_fillrect((touch>>16)-10, (touch&0xFFFF)-5, 10, 10);
+ lcd_fillrect((touch>>16)-5, (touch&0xFFFF)-5, 5, 5);
lcd_update();
lcd_set_foreground(LCD_WHITE);
}
diff --git a/docs/CREDITS b/docs/CREDITS
index 0fdcd27..0fdcd27 100755..100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 711a7c0..711a7c0 100755..100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h
index 2856e7e..2856e7e 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 5c4d3e7..5c4d3e7 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 7216ef0..7216ef0 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 75aa76a..75aa76a 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 1aa9881..0271fd1 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 887d741..887d741 100755..100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h