From 8b6950493bb281e8aac996219d33188c482b1d67 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Thu, 16 Sep 2004 14:36:08 +0000 Subject: 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 --- firmware/export/config-fmrecorder.h | 7 +++++++ firmware/export/config-h100.h | 28 ++++++++++++++++++++++++++++ firmware/export/config-ondiofm.h | 7 +++++++ firmware/export/config-ondiosp.h | 8 ++++++++ firmware/export/config-player.h | 6 ++++++ firmware/export/config-recorder.h | 7 +++++++ firmware/export/config-recorderv2.h | 7 +++++++ firmware/export/config.h | 2 ++ firmware/export/lcd.h | 5 ----- 9 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 firmware/export/config-h100.h (limited to 'firmware/export') diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index b72eb9794a..16085fb480 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 0000000000..2efe4834a7 --- /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 b7b557e1ec..33a4f91b5f 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 4189448070..a4f95a2947 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 2e50a2fc85..9f060512fa 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 b228dea285..5edba3bf85 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 1066ece536..d442ea2dd8 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 782668f161..359eadd82d 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 7dda83d8da..21d1f4cc55 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)) -- cgit v1.2.3