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.tar.gz
rockbox-9da2456c2677ca074c35e0dd84837c3c32798cc0.zip
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 693644df5e..693644df5e 100755..100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index 0695dc0190..09acbc8166 100755..100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -29,13 +29,13 @@
29#include "lcd.h" 29#include "lcd.h"
30#include "ata.h" 30#include "ata.h"
31#include "usb.h" 31#include "usb.h"
32#include "storage.h"
33#include "system.h" 32#include "system.h"
34#include "button.h" 33#include "button.h"
35#include "timefuncs.h" 34#include "timefuncs.h"
36#include "rtc.h" 35#include "rtc.h"
37#include "common.h" 36#include "common.h"
38#include "mipsregs.h" 37#include "mipsregs.h"
38#include "storage.h"
39 39
40#ifdef ONDA_VX747P 40#ifdef ONDA_VX747P
41 #define ONDA_VX747 41 #define ONDA_VX747
@@ -112,19 +112,14 @@ int main(void)
112 KNOP(BUTTON_POWER, 3); 112 KNOP(BUTTON_POWER, 3);
113 lcd_set_foreground(LCD_WHITE); 113 lcd_set_foreground(LCD_WHITE);
114 if(button_hold()) 114 if(button_hold())
115 {
116 printf("BUTTON_HOLD"); 115 printf("BUTTON_HOLD");
117 asm("break 0x7");
118 }
119 if(btn & BUTTON_POWER) 116 if(btn & BUTTON_POWER)
120 {
121 power_off(); 117 power_off();
122 }
123#ifdef ONDA_VX747 118#ifdef ONDA_VX747
124 if(btn & BUTTON_TOUCH) 119 if(btn & BUTTON_TOUCH)
125 { 120 {
126 lcd_set_foreground(LCD_RGBPACK(touch & 0xFF, (touch >> 8)&0xFF, (touch >> 16)&0xFF)); 121 lcd_set_foreground(LCD_RGBPACK(touch & 0xFF, (touch >> 8)&0xFF, (touch >> 16)&0xFF));
127 lcd_fillrect((touch>>16)-10, (touch&0xFFFF)-5, 10, 10); 122 lcd_fillrect((touch>>16)-5, (touch&0xFFFF)-5, 5, 5);
128 lcd_update(); 123 lcd_update();
129 lcd_set_foreground(LCD_WHITE); 124 lcd_set_foreground(LCD_WHITE);
130 } 125 }
diff --git a/docs/CREDITS b/docs/CREDITS
index 0fdcd27dbe..0fdcd27dbe 100755..100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
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)
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}
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