diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/config-h10.h | 8 | ||||
-rw-r--r-- | firmware/export/config-h10_5gb.h | 8 | ||||
-rw-r--r-- | firmware/system.c | 10 | ||||
-rwxr-xr-x | firmware/target/arm/iriver/h10/adc-h10.c | 41 | ||||
-rw-r--r-- | firmware/target/arm/iriver/h10/lcd-h10.c | 16 |
6 files changed, 77 insertions, 8 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index f313dcd902..8826337f4e 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -259,6 +259,7 @@ target/arm/ata-pp5020.c | |||
259 | target/arm/iriver/h10/power-h10.c | 259 | target/arm/iriver/h10/power-h10.c |
260 | target/arm/iriver/h10/usb-h10.c | 260 | target/arm/iriver/h10/usb-h10.c |
261 | target/arm/iriver/h10/lcd-h10.c | 261 | target/arm/iriver/h10/lcd-h10.c |
262 | target/arm/iriver/h10/adc-h10.c | ||
262 | #endif | 263 | #endif |
263 | #endif | 264 | #endif |
264 | 265 | ||
@@ -270,6 +271,7 @@ target/arm/ata-pp5020.c | |||
270 | target/arm/iriver/h10/power-h10.c | 271 | target/arm/iriver/h10/power-h10.c |
271 | target/arm/iriver/h10/usb-h10.c | 272 | target/arm/iriver/h10/usb-h10.c |
272 | target/arm/iriver/h10/lcd-h10.c | 273 | target/arm/iriver/h10/lcd-h10.c |
274 | target/arm/iriver/h10/adc-h10.c | ||
273 | #endif | 275 | #endif |
274 | #endif | 276 | #endif |
275 | 277 | ||
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 099df0d715..d225baddbe 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | /* define this if you have a real-time clock */ | 38 | /* define this if you have a real-time clock */ |
39 | #ifndef BOOTLOADER | 39 | #ifndef BOOTLOADER |
40 | #define CONFIG_RTC RTC_E8564 /* TODO: figure this out */ | 40 | /*#define CONFIG_RTC RTC_E8564*/ /* TODO: figure this out */ |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | /* Define this if you have a software controlled poweroff */ | 43 | /* Define this if you have a software controlled poweroff */ |
@@ -99,6 +99,8 @@ | |||
99 | /* Type of LCD */ | 99 | /* Type of LCD */ |
100 | #define CONFIG_LCD LCD_H10 | 100 | #define CONFIG_LCD LCD_H10 |
101 | 101 | ||
102 | #define DEFAULT_CONTRAST_SETTING 19 | ||
103 | |||
102 | /* Offset ( in the firmware file's header ) to the file length */ | 104 | /* Offset ( in the firmware file's header ) to the file length */ |
103 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | 105 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 |
104 | 106 | ||
@@ -111,13 +113,13 @@ | |||
111 | /* #define USB_IPODSTYLE */ | 113 | /* #define USB_IPODSTYLE */ |
112 | 114 | ||
113 | /* define this if the unit can be powered or charged via USB */ | 115 | /* define this if the unit can be powered or charged via USB */ |
114 | #define HAVE_USB_POWER | 116 | /*#define HAVE_USB_POWER*/ |
115 | 117 | ||
116 | /* Virtual LED (icon) */ | 118 | /* Virtual LED (icon) */ |
117 | #define CONFIG_LED LED_VIRTUAL | 119 | #define CONFIG_LED LED_VIRTUAL |
118 | 120 | ||
119 | /* Define this if you have adjustable CPU frequency */ | 121 | /* Define this if you have adjustable CPU frequency */ |
120 | #define HAVE_ADJUSTABLE_CPU_FREQ | 122 | /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ |
121 | 123 | ||
122 | #define BOOTFILE_EXT "h10" | 124 | #define BOOTFILE_EXT "h10" |
123 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 125 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index c5aaceb573..b4ff34b612 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | /* define this if you have a real-time clock */ | 39 | /* define this if you have a real-time clock */ |
40 | #ifndef BOOTLOADER | 40 | #ifndef BOOTLOADER |
41 | #define CONFIG_RTC RTC_E8564 /* TODO: figure this out */ | 41 | /*#define CONFIG_RTC RTC_E8564*/ /* TODO: figure this out */ |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | /* Define this if you have a software controlled poweroff */ | 44 | /* Define this if you have a software controlled poweroff */ |
@@ -98,6 +98,8 @@ | |||
98 | /* Type of LCD */ | 98 | /* Type of LCD */ |
99 | #define CONFIG_LCD LCD_H10_5GB | 99 | #define CONFIG_LCD LCD_H10_5GB |
100 | 100 | ||
101 | #define DEFAULT_CONTRAST_SETTING 19 | ||
102 | |||
101 | /* Offset ( in the firmware file's header ) to the file length */ | 103 | /* Offset ( in the firmware file's header ) to the file length */ |
102 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | 104 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 |
103 | 105 | ||
@@ -110,13 +112,13 @@ | |||
110 | /* #define USB_IPODSTYLE */ | 112 | /* #define USB_IPODSTYLE */ |
111 | 113 | ||
112 | /* define this if the unit can be powered or charged via USB */ | 114 | /* define this if the unit can be powered or charged via USB */ |
113 | #define HAVE_USB_POWER | 115 | /*#define HAVE_USB_POWER*/ |
114 | 116 | ||
115 | /* Virtual LED (icon) */ | 117 | /* Virtual LED (icon) */ |
116 | #define CONFIG_LED LED_VIRTUAL | 118 | #define CONFIG_LED LED_VIRTUAL |
117 | 119 | ||
118 | /* Define this if you have adjustable CPU frequency */ | 120 | /* Define this if you have adjustable CPU frequency */ |
119 | #define HAVE_ADJUSTABLE_CPU_FREQ | 121 | /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ |
120 | 122 | ||
121 | #define BOOTFILE_EXT "h10" | 123 | #define BOOTFILE_EXT "h10" |
122 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 124 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
diff --git a/firmware/system.c b/firmware/system.c index 2767f50edc..c97b5233ec 100644 --- a/firmware/system.c +++ b/firmware/system.c | |||
@@ -1162,6 +1162,16 @@ void irq(void) | |||
1162 | else if (CPU_HI_INT_STAT & GPIO_MASK) | 1162 | else if (CPU_HI_INT_STAT & GPIO_MASK) |
1163 | ipod_mini_button_int(); | 1163 | ipod_mini_button_int(); |
1164 | } | 1164 | } |
1165 | #elif (defined IRIVER_H10) || (defined IRIVER_H10_5GB) | ||
1166 | /* TODO: this should really be in the target tree, but moving it there caused | ||
1167 | crt0.S not to find it while linking */ | ||
1168 | void irq(void) | ||
1169 | { | ||
1170 | if (CPU_INT_STAT & TIMER1_MASK) | ||
1171 | TIMER1(); | ||
1172 | else if (CPU_INT_STAT & TIMER2_MASK) | ||
1173 | TIMER2(); | ||
1174 | } | ||
1165 | #else | 1175 | #else |
1166 | extern void ipod_4g_button_int(void); | 1176 | extern void ipod_4g_button_int(void); |
1167 | 1177 | ||
diff --git a/firmware/target/arm/iriver/h10/adc-h10.c b/firmware/target/arm/iriver/h10/adc-h10.c new file mode 100755 index 0000000000..0e17ae4f91 --- /dev/null +++ b/firmware/target/arm/iriver/h10/adc-h10.c | |||
@@ -0,0 +1,41 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Barry Wardell | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #include "config.h" | ||
20 | #include "cpu.h" | ||
21 | #include "system.h" | ||
22 | #include "kernel.h" | ||
23 | #include "thread.h" | ||
24 | #include "adc.h" | ||
25 | |||
26 | /* TODO: implement adc functionality */ | ||
27 | unsigned short adc_scan(int channel) | ||
28 | { | ||
29 | (void)channel; | ||
30 | return 0; | ||
31 | } | ||
32 | |||
33 | unsigned short adc_read(int channel) | ||
34 | { | ||
35 | (void)channel; | ||
36 | return 0; | ||
37 | } | ||
38 | |||
39 | void adc_init(void) | ||
40 | { | ||
41 | } | ||
diff --git a/firmware/target/arm/iriver/h10/lcd-h10.c b/firmware/target/arm/iriver/h10/lcd-h10.c index 022dc22208..7367bdc09b 100644 --- a/firmware/target/arm/iriver/h10/lcd-h10.c +++ b/firmware/target/arm/iriver/h10/lcd-h10.c | |||
@@ -155,14 +155,26 @@ void lcd_blit(const fb_data* data, int x, int by, int width, | |||
155 | (void)stride; | 155 | (void)stride; |
156 | } | 156 | } |
157 | 157 | ||
158 | 158 | void lcd_yuv_blit(unsigned char * const src[3], | |
159 | int src_x, int src_y, int stride, | ||
160 | int x, int y, int width, int height) | ||
161 | { | ||
162 | (void)src; | ||
163 | (void)src_x; | ||
164 | (void)src_y; | ||
165 | (void)stride; | ||
166 | (void)x; | ||
167 | (void)y; | ||
168 | (void)width; | ||
169 | (void)height; | ||
170 | } | ||
159 | 171 | ||
160 | 172 | ||
161 | /* Update a fraction of the display. */ | 173 | /* Update a fraction of the display. */ |
162 | void lcd_update_rect(int x, int y, int width, int height) | 174 | void lcd_update_rect(int x, int y, int width, int height) |
163 | { | 175 | { |
164 | int y0, x0, y1, x1; | 176 | int y0, x0, y1, x1; |
165 | int newx,newwidth; | 177 | /*int newx,newwidth;*/ |
166 | 178 | ||
167 | unsigned long *addr = (unsigned long *)lcd_framebuffer; | 179 | unsigned long *addr = (unsigned long *)lcd_framebuffer; |
168 | 180 | ||