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);
 
 #define BUTTON_REMOTE 0
 
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-/* Toshiba Gigabeat specific button codes */
-
-#define BUTTON_POWER        0x00000001
-#define BUTTON_MENU         0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_UP           0x00000010
-#define BUTTON_DOWN         0x00000020
-
-#define BUTTON_VOL_UP       0x00000040
-#define BUTTON_VOL_DOWN     0x00000080
-
-#define BUTTON_SELECT       0x00000100
-#define BUTTON_A            0x00000200
-
-
-#define BUTTON_MAIN (BUTTON_POWER|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\
-                |BUTTON_UP|BUTTON_DOWN|BUTTON_VOL_UP|BUTTON_VOL_DOWN\
-                |BUTTON_SELECT|BUTTON_A)
-
-
-#define BUTTON_REMOTE 0
-
 #elif 0
 
 /* 
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 @@
 /*
  * This config file is for toshiba Gigabeat F
  */
+#define TARGET_TREE /* this target is using the target tree system */
+
 #define TOSHIBA_GIGABEAT_F 1
 
 /* For Rolo and boot loader */
@@ -25,7 +27,10 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-//#define CONFIG_RTC RTC_PCF50606
+
+#if 0 /* TODO */
+#define CONFIG_RTC RTC_S3C2440
+#endif
 
 /* Define this for LCD backlight available */
 #define CONFIG_BACKLIGHT BL_GIGABEAT /* port controlled PWM */
@@ -42,7 +47,7 @@
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8751
 
-#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
+#define BATTERY_CAPACITY_DEFAULT 830 /* default battery capacity */
 
 #ifndef SIMULATOR
 
@@ -59,7 +64,7 @@
 #define BATTERY_CAPACITY_INC 50   /* capacity increment */
 #define BATTERY_TYPES_COUNT  1    /* only one type */
 
-#define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */
+#define BATTERY_SCALE_FACTOR 6852 /* FIX: this value is picked at random */
 
 /* Hardware controlled charging? FIXME */
 #define CONFIG_CHARGING CHARGING_SIMPLE
@@ -74,7 +79,9 @@
 #define CPU_FREQ 16934400
 
 /* Define this if you have ATA power-off control */
+#if 0 /* TODO */
 #define HAVE_ATA_POWER_OFF
+#endif
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
@@ -87,14 +94,18 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 8
 
-#define USB_IRIVERSTYLE
+#define USB_GIGABEAT_STYLE
 
 /* Define this if you have adjustable CPU frequency */
+#if 0 /* TODO */
 #define HAVE_ADJUSTABLE_CPU_FREQ
+#endif
 
 #define BOOTFILE_EXT "gigabeat"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 
+#if 0 /* TODO */
 #define HAVE_BACKLIGHT_BRIGHTNESS
+#endif
 
 #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 @@
 #define LCDINTMSK (*(volatile int *)0x4D00005C) /* LCD interrupt mask */
 #define TCONSEL (*(volatile int *)0x4D000060) /* TCON(LPC3600/LCC3600) control */
 
+/* The following should be computed but for now, we cheat. */
+#define FRAME   ( (volatile short * ) 0x31E00000  ) /* LCD Frame buffer */
+
 /* NAND Flash */
 
 #define NFCONF (*(volatile int *)0x4E000000) /* NAND flash configuration */