diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-08-12 08:01:54 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-08-12 08:01:54 +0000 |
commit | dd754886f5fd4004b521c954e263772d35fb6a46 (patch) | |
tree | bcf072bd18da2c7d2b5aa0ebbb89a01a50354f23 /firmware/export | |
parent | e6ed58f6c545719ed804c9ad513496f8d0fa0286 (diff) | |
download | rockbox-dd754886f5fd4004b521c954e263772d35fb6a46.tar.gz rockbox-dd754886f5fd4004b521c954e263772d35fb6a46.zip |
update the gigabeat code and move to target_tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10535 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/button.h | 25 | ||||
-rw-r--r-- | firmware/export/config-gigabeat.h | 19 | ||||
-rw-r--r-- | firmware/export/s3c2440.h | 3 |
3 files changed, 18 insertions, 29 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 92c9415372..0e11da9da5 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -261,31 +261,6 @@ bool remote_button_hold(void); | |||
261 | 261 | ||
262 | #define BUTTON_REMOTE 0 | 262 | #define BUTTON_REMOTE 0 |
263 | 263 | ||
264 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | ||
265 | /* Toshiba Gigabeat specific button codes */ | ||
266 | |||
267 | #define BUTTON_POWER 0x00000001 | ||
268 | #define BUTTON_MENU 0x00000002 | ||
269 | |||
270 | #define BUTTON_LEFT 0x00000004 | ||
271 | #define BUTTON_RIGHT 0x00000008 | ||
272 | #define BUTTON_UP 0x00000010 | ||
273 | #define BUTTON_DOWN 0x00000020 | ||
274 | |||
275 | #define BUTTON_VOL_UP 0x00000040 | ||
276 | #define BUTTON_VOL_DOWN 0x00000080 | ||
277 | |||
278 | #define BUTTON_SELECT 0x00000100 | ||
279 | #define BUTTON_A 0x00000200 | ||
280 | |||
281 | |||
282 | #define BUTTON_MAIN (BUTTON_POWER|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ | ||
283 | |BUTTON_UP|BUTTON_DOWN|BUTTON_VOL_UP|BUTTON_VOL_DOWN\ | ||
284 | |BUTTON_SELECT|BUTTON_A) | ||
285 | |||
286 | |||
287 | #define BUTTON_REMOTE 0 | ||
288 | |||
289 | #elif 0 | 264 | #elif 0 |
290 | 265 | ||
291 | /* | 266 | /* |
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index 1ebbdbf908..fee2b79b2e 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h | |||
@@ -1,6 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * This config file is for toshiba Gigabeat F | 2 | * This config file is for toshiba Gigabeat F |
3 | */ | 3 | */ |
4 | #define TARGET_TREE /* this target is using the target tree system */ | ||
5 | |||
4 | #define TOSHIBA_GIGABEAT_F 1 | 6 | #define TOSHIBA_GIGABEAT_F 1 |
5 | 7 | ||
6 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
@@ -25,7 +27,10 @@ | |||
25 | #define CONFIG_CODEC SWCODEC | 27 | #define CONFIG_CODEC SWCODEC |
26 | 28 | ||
27 | /* define this if you have a real-time clock */ | 29 | /* define this if you have a real-time clock */ |
28 | //#define CONFIG_RTC RTC_PCF50606 | 30 | |
31 | #if 0 /* TODO */ | ||
32 | #define CONFIG_RTC RTC_S3C2440 | ||
33 | #endif | ||
29 | 34 | ||
30 | /* Define this for LCD backlight available */ | 35 | /* Define this for LCD backlight available */ |
31 | #define CONFIG_BACKLIGHT BL_GIGABEAT /* port controlled PWM */ | 36 | #define CONFIG_BACKLIGHT BL_GIGABEAT /* port controlled PWM */ |
@@ -42,7 +47,7 @@ | |||
42 | /* Define this if you have the WM8975 audio codec */ | 47 | /* Define this if you have the WM8975 audio codec */ |
43 | #define HAVE_WM8751 | 48 | #define HAVE_WM8751 |
44 | 49 | ||
45 | #define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */ | 50 | #define BATTERY_CAPACITY_DEFAULT 830 /* default battery capacity */ |
46 | 51 | ||
47 | #ifndef SIMULATOR | 52 | #ifndef SIMULATOR |
48 | 53 | ||
@@ -59,7 +64,7 @@ | |||
59 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | 64 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
60 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 65 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
61 | 66 | ||
62 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | 67 | #define BATTERY_SCALE_FACTOR 6852 /* FIX: this value is picked at random */ |
63 | 68 | ||
64 | /* Hardware controlled charging? FIXME */ | 69 | /* Hardware controlled charging? FIXME */ |
65 | #define CONFIG_CHARGING CHARGING_SIMPLE | 70 | #define CONFIG_CHARGING CHARGING_SIMPLE |
@@ -74,7 +79,9 @@ | |||
74 | #define CPU_FREQ 16934400 | 79 | #define CPU_FREQ 16934400 |
75 | 80 | ||
76 | /* Define this if you have ATA power-off control */ | 81 | /* Define this if you have ATA power-off control */ |
82 | #if 0 /* TODO */ | ||
77 | #define HAVE_ATA_POWER_OFF | 83 | #define HAVE_ATA_POWER_OFF |
84 | #endif | ||
78 | 85 | ||
79 | /* Virtual LED (icon) */ | 86 | /* Virtual LED (icon) */ |
80 | #define CONFIG_LED LED_VIRTUAL | 87 | #define CONFIG_LED LED_VIRTUAL |
@@ -87,14 +94,18 @@ | |||
87 | /* Offset ( in the firmware file's header ) to the real data */ | 94 | /* Offset ( in the firmware file's header ) to the real data */ |
88 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 95 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
89 | 96 | ||
90 | #define USB_IRIVERSTYLE | 97 | #define USB_GIGABEAT_STYLE |
91 | 98 | ||
92 | /* Define this if you have adjustable CPU frequency */ | 99 | /* Define this if you have adjustable CPU frequency */ |
100 | #if 0 /* TODO */ | ||
93 | #define HAVE_ADJUSTABLE_CPU_FREQ | 101 | #define HAVE_ADJUSTABLE_CPU_FREQ |
102 | #endif | ||
94 | 103 | ||
95 | #define BOOTFILE_EXT "gigabeat" | 104 | #define BOOTFILE_EXT "gigabeat" |
96 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 105 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
97 | 106 | ||
107 | #if 0 /* TODO */ | ||
98 | #define HAVE_BACKLIGHT_BRIGHTNESS | 108 | #define HAVE_BACKLIGHT_BRIGHTNESS |
109 | #endif | ||
99 | 110 | ||
100 | #endif | 111 | #endif |
diff --git a/firmware/export/s3c2440.h b/firmware/export/s3c2440.h index 9b42256a38..799c14eb0e 100644 --- a/firmware/export/s3c2440.h +++ b/firmware/export/s3c2440.h | |||
@@ -143,6 +143,9 @@ | |||
143 | #define LCDINTMSK (*(volatile int *)0x4D00005C) /* LCD interrupt mask */ | 143 | #define LCDINTMSK (*(volatile int *)0x4D00005C) /* LCD interrupt mask */ |
144 | #define TCONSEL (*(volatile int *)0x4D000060) /* TCON(LPC3600/LCC3600) control */ | 144 | #define TCONSEL (*(volatile int *)0x4D000060) /* TCON(LPC3600/LCC3600) control */ |
145 | 145 | ||
146 | /* The following should be computed but for now, we cheat. */ | ||
147 | #define FRAME ( (volatile short * ) 0x31E00000 ) /* LCD Frame buffer */ | ||
148 | |||
146 | /* NAND Flash */ | 149 | /* NAND Flash */ |
147 | 150 | ||
148 | #define NFCONF (*(volatile int *)0x4E000000) /* NAND flash configuration */ | 151 | #define NFCONF (*(volatile int *)0x4E000000) /* NAND flash configuration */ |