From 9da2456c2677ca074c35e0dd84837c3c32798cc0 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 19 Dec 2008 11:29:18 +0000 Subject: Fix SVN properties git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19482 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/SOURCES | 0 bootloader/ondavx747.c | 9 ++------- docs/CREDITS | 0 firmware/SOURCES | 0 firmware/export/config-ondavx747.h | 0 firmware/export/config-ondavx747p.h | 0 firmware/export/config-ondavx767.h | 0 firmware/export/config.h | 0 firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c | 9 ++++----- firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h | 0 10 files changed, 6 insertions(+), 12 deletions(-) mode change 100755 => 100644 bootloader/SOURCES mode change 100755 => 100644 bootloader/ondavx747.c mode change 100755 => 100644 docs/CREDITS mode change 100755 => 100644 firmware/SOURCES mode change 100755 => 100644 firmware/export/config-ondavx747.h mode change 100755 => 100644 firmware/export/config-ondavx747p.h mode change 100755 => 100644 firmware/export/config-ondavx767.h mode change 100755 => 100644 firmware/export/config.h mode change 100755 => 100644 firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c mode change 100755 => 100644 firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h diff --git a/bootloader/SOURCES b/bootloader/SOURCES old mode 100755 new mode 100644 diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c old mode 100755 new mode 100644 index 0695dc0190..09acbc8166 --- 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 old mode 100755 new mode 100644 diff --git a/firmware/SOURCES b/firmware/SOURCES old mode 100755 new mode 100644 diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h old mode 100755 new mode 100644 diff --git a/firmware/export/config-ondavx747p.h b/firmware/export/config-ondavx747p.h old mode 100755 new mode 100644 diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h old mode 100755 new mode 100644 diff --git a/firmware/export/config.h b/firmware/export/config.h old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 index 1aa98819fe..0271fd1b96 --- 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 old mode 100755 new mode 100644 -- cgit v1.2.3