Moved LCD_WIDHT/HEIGHT from lcd driver to config file.

Simulators now use conig-xxx.h.
Added Iriver H100 to tools/configure.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5081 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 75 insertions, 5 deletions

diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index a711a8f..00fa63c 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -106,6 +106,9 @@ static int curfont = FONT_SYSFIXED;
 static int xoffset; /* needed for flip */
 #endif
 
+int lcd_width = 112;
+int lcd_height = 64;
+
 unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 
 /* All zeros and ones bitmaps for area filling */
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index b72eb97..16085fb 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -4,12 +4,18 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have a Recorder style 10-key keyboard */
 #define HAVE_RECORDER_KEYPAD 1
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
new file mode 100644
index 0000000..2efe483
--- /dev/null
+++ b/firmware/export/config-h100.h
@@ -0,0 +1,28 @@
+/* define this if you have recording possibility */
+#define HAVE_RECORDING 1
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP 1
+
+/* LCD dimensions */
+#define LCD_WIDTH  160
+#define LCD_HEIGHT 128
+
+/* define this if you have the Recorder's 10-key keyboard */
+#define HAVE_RECORDER_KEYPAD 1
+
+#ifndef SIMULATOR
+
+/* Define this if the platform has batteries */
+#define HAVE_BATTERIES 1
+
+/* The start address index for ROM builds */
+#define ROM_START 0x11010
+
+/* Define this for programmable LED available */
+#define HAVE_LED
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+
+#endif
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index b7b557e..33a4f91 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -4,9 +4,15 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have an Ondio style 6-key keyboard */
 #define HAVE_ONDIO_KEYPAD
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,4 @@
 /* Define this for MMC support instead of ATA harddisk */
 #define HAVE_MMC
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 4189448..a4f95a2 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -4,9 +4,15 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have an Ondio style 6-key keyboard */
 #define HAVE_ONDIO_KEYPAD
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,5 @@
 /* Define this for MMC support instead of ATA harddisk */
 #define HAVE_MMC
 
+#endif /* SIMULATOR */
+
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 2e50a2f..9f06051 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -1,9 +1,14 @@
 /* define this if you have a charcell LCD display */
 #define HAVE_LCD_CHARCELLS 1
 
+/* LCD dimensions (for the simulator) */
+#define LCD_WIDTH       (4*11*6)    /* Display width in pixels */
+#define LCD_HEIGHT      (4*16+2*24) /* 4*char + 2*icons */
+
 /* define this if you have the Player's keyboard */
 #define HAVE_PLAYER_KEYPAD 1
 
+#ifndef SIMULATOR
 /* Define this if you have a MAS3507D */
 #define HAVE_MAS3507D
 
@@ -44,3 +49,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index b228dea..5edba3b 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -4,12 +4,18 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have the Recorder's 10-key keyboard */
 #define HAVE_RECORDER_KEYPAD 1
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -55,3 +61,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 1066ece..d442ea2 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -4,12 +4,18 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have a Recorder style 10-key keyboard */
 #define HAVE_RECORDER_KEYPAD 1
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 782668f..359eadd 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -34,6 +34,8 @@
 #include "config-ondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
 #include "config-ondiofm.h"
+#elif defined(IRIVER_H100)
+#include "config-h100.h"
 #else
 /* no known platform */
 #endif
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 7dda83d..21d1f4c 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -105,11 +105,6 @@ void lcd_remove_cursor(void);
 
 #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
 #if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
-#define LCD_WIDTH       (4*11*6)  /* Display width in pixels */
-#define LCD_HEIGHT      (4*16+2*24) /* 4*char + 2*icons */
-#else
-#define LCD_WIDTH       112   /* Display width in pixels */
-#define LCD_HEIGHT      64    /* Display height in pixels */
 #endif
 
 #define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7))