diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 3 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 7 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 28 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 7 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 8 | ||||
-rw-r--r-- | firmware/export/config-player.h | 6 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 7 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 7 | ||||
-rw-r--r-- | firmware/export/config.h | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 5 |
10 files changed, 75 insertions, 5 deletions
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index a711a8fa6d..00fa63cd4e 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c | |||
@@ -106,6 +106,9 @@ static int curfont = FONT_SYSFIXED; | |||
106 | static int xoffset; /* needed for flip */ | 106 | static int xoffset; /* needed for flip */ |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | int lcd_width = 112; | ||
110 | int lcd_height = 64; | ||
111 | |||
109 | unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; | 112 | unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; |
110 | 113 | ||
111 | /* All zeros and ones bitmaps for area filling */ | 114 | /* All zeros and ones bitmaps for area filling */ |
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 @@ | |||
4 | /* define this if you have a bitmap LCD display */ | 4 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 5 | #define HAVE_LCD_BITMAP 1 |
6 | 6 | ||
7 | /* LCD dimensions */ | ||
8 | #define LCD_WIDTH 112 | ||
9 | #define LCD_HEIGHT 64 | ||
10 | |||
7 | /* define this if you have a Recorder style 10-key keyboard */ | 11 | /* define this if you have a Recorder style 10-key keyboard */ |
8 | #define HAVE_RECORDER_KEYPAD 1 | 12 | #define HAVE_RECORDER_KEYPAD 1 |
9 | 13 | ||
10 | /* define this if you have a real-time clock */ | 14 | /* define this if you have a real-time clock */ |
11 | #define HAVE_RTC 1 | 15 | #define HAVE_RTC 1 |
12 | 16 | ||
17 | #ifndef SIMULATOR | ||
18 | |||
13 | /* Define this if you have a MAS3587F */ | 19 | /* Define this if you have a MAS3587F */ |
14 | #define HAVE_MAS3587F | 20 | #define HAVE_MAS3587F |
15 | 21 | ||
@@ -64,3 +70,4 @@ | |||
64 | /* Define this for LCD backlight available */ | 70 | /* Define this for LCD backlight available */ |
65 | #define HAVE_BACKLIGHT | 71 | #define HAVE_BACKLIGHT |
66 | 72 | ||
73 | #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 @@ | |||
1 | /* define this if you have recording possibility */ | ||
2 | #define HAVE_RECORDING 1 | ||
3 | |||
4 | /* define this if you have a bitmap LCD display */ | ||
5 | #define HAVE_LCD_BITMAP 1 | ||
6 | |||
7 | /* LCD dimensions */ | ||
8 | #define LCD_WIDTH 160 | ||
9 | #define LCD_HEIGHT 128 | ||
10 | |||
11 | /* define this if you have the Recorder's 10-key keyboard */ | ||
12 | #define HAVE_RECORDER_KEYPAD 1 | ||
13 | |||
14 | #ifndef SIMULATOR | ||
15 | |||
16 | /* Define this if the platform has batteries */ | ||
17 | #define HAVE_BATTERIES 1 | ||
18 | |||
19 | /* The start address index for ROM builds */ | ||
20 | #define ROM_START 0x11010 | ||
21 | |||
22 | /* Define this for programmable LED available */ | ||
23 | #define HAVE_LED | ||
24 | |||
25 | /* Define this for LCD backlight available */ | ||
26 | #define HAVE_BACKLIGHT | ||
27 | |||
28 | #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 @@ | |||
4 | /* define this if you have a bitmap LCD display */ | 4 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 5 | #define HAVE_LCD_BITMAP 1 |
6 | 6 | ||
7 | /* LCD dimensions */ | ||
8 | #define LCD_WIDTH 112 | ||
9 | #define LCD_HEIGHT 64 | ||
10 | |||
7 | /* define this if you have an Ondio style 6-key keyboard */ | 11 | /* define this if you have an Ondio style 6-key keyboard */ |
8 | #define HAVE_ONDIO_KEYPAD | 12 | #define HAVE_ONDIO_KEYPAD |
9 | 13 | ||
14 | #ifndef SIMULATOR | ||
15 | |||
10 | /* Define this if you have a MAS3587F */ | 16 | /* Define this if you have a MAS3587F */ |
11 | #define HAVE_MAS3587F | 17 | #define HAVE_MAS3587F |
12 | 18 | ||
@@ -64,3 +70,4 @@ | |||
64 | /* Define this for MMC support instead of ATA harddisk */ | 70 | /* Define this for MMC support instead of ATA harddisk */ |
65 | #define HAVE_MMC | 71 | #define HAVE_MMC |
66 | 72 | ||
73 | #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 @@ | |||
4 | /* define this if you have a bitmap LCD display */ | 4 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 5 | #define HAVE_LCD_BITMAP 1 |
6 | 6 | ||
7 | /* LCD dimensions */ | ||
8 | #define LCD_WIDTH 112 | ||
9 | #define LCD_HEIGHT 64 | ||
10 | |||
7 | /* define this if you have an Ondio style 6-key keyboard */ | 11 | /* define this if you have an Ondio style 6-key keyboard */ |
8 | #define HAVE_ONDIO_KEYPAD | 12 | #define HAVE_ONDIO_KEYPAD |
9 | 13 | ||
14 | #ifndef SIMULATOR | ||
15 | |||
10 | /* Define this if you have a MAS3587F */ | 16 | /* Define this if you have a MAS3587F */ |
11 | #define HAVE_MAS3587F | 17 | #define HAVE_MAS3587F |
12 | 18 | ||
@@ -64,3 +70,5 @@ | |||
64 | /* Define this for MMC support instead of ATA harddisk */ | 70 | /* Define this for MMC support instead of ATA harddisk */ |
65 | #define HAVE_MMC | 71 | #define HAVE_MMC |
66 | 72 | ||
73 | #endif /* SIMULATOR */ | ||
74 | |||
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 @@ | |||
1 | /* define this if you have a charcell LCD display */ | 1 | /* define this if you have a charcell LCD display */ |
2 | #define HAVE_LCD_CHARCELLS 1 | 2 | #define HAVE_LCD_CHARCELLS 1 |
3 | 3 | ||
4 | /* LCD dimensions (for the simulator) */ | ||
5 | #define LCD_WIDTH (4*11*6) /* Display width in pixels */ | ||
6 | #define LCD_HEIGHT (4*16+2*24) /* 4*char + 2*icons */ | ||
7 | |||
4 | /* define this if you have the Player's keyboard */ | 8 | /* define this if you have the Player's keyboard */ |
5 | #define HAVE_PLAYER_KEYPAD 1 | 9 | #define HAVE_PLAYER_KEYPAD 1 |
6 | 10 | ||
11 | #ifndef SIMULATOR | ||
7 | /* Define this if you have a MAS3507D */ | 12 | /* Define this if you have a MAS3507D */ |
8 | #define HAVE_MAS3507D | 13 | #define HAVE_MAS3507D |
9 | 14 | ||
@@ -44,3 +49,4 @@ | |||
44 | /* Define this for LCD backlight available */ | 49 | /* Define this for LCD backlight available */ |
45 | #define HAVE_BACKLIGHT | 50 | #define HAVE_BACKLIGHT |
46 | 51 | ||
52 | #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 @@ | |||
4 | /* define this if you have a bitmap LCD display */ | 4 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 5 | #define HAVE_LCD_BITMAP 1 |
6 | 6 | ||
7 | /* LCD dimensions */ | ||
8 | #define LCD_WIDTH 112 | ||
9 | #define LCD_HEIGHT 64 | ||
10 | |||
7 | /* define this if you have the Recorder's 10-key keyboard */ | 11 | /* define this if you have the Recorder's 10-key keyboard */ |
8 | #define HAVE_RECORDER_KEYPAD 1 | 12 | #define HAVE_RECORDER_KEYPAD 1 |
9 | 13 | ||
10 | /* define this if you have a real-time clock */ | 14 | /* define this if you have a real-time clock */ |
11 | #define HAVE_RTC 1 | 15 | #define HAVE_RTC 1 |
12 | 16 | ||
17 | #ifndef SIMULATOR | ||
18 | |||
13 | /* Define this if you have a MAS3587F */ | 19 | /* Define this if you have a MAS3587F */ |
14 | #define HAVE_MAS3587F | 20 | #define HAVE_MAS3587F |
15 | 21 | ||
@@ -55,3 +61,4 @@ | |||
55 | /* Define this for LCD backlight available */ | 61 | /* Define this for LCD backlight available */ |
56 | #define HAVE_BACKLIGHT | 62 | #define HAVE_BACKLIGHT |
57 | 63 | ||
64 | #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 @@ | |||
4 | /* define this if you have a bitmap LCD display */ | 4 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 5 | #define HAVE_LCD_BITMAP 1 |
6 | 6 | ||
7 | /* LCD dimensions */ | ||
8 | #define LCD_WIDTH 112 | ||
9 | #define LCD_HEIGHT 64 | ||
10 | |||
7 | /* define this if you have a Recorder style 10-key keyboard */ | 11 | /* define this if you have a Recorder style 10-key keyboard */ |
8 | #define HAVE_RECORDER_KEYPAD 1 | 12 | #define HAVE_RECORDER_KEYPAD 1 |
9 | 13 | ||
10 | /* define this if you have a real-time clock */ | 14 | /* define this if you have a real-time clock */ |
11 | #define HAVE_RTC 1 | 15 | #define HAVE_RTC 1 |
12 | 16 | ||
17 | #ifndef SIMULATOR | ||
18 | |||
13 | /* Define this if you have a MAS3587F */ | 19 | /* Define this if you have a MAS3587F */ |
14 | #define HAVE_MAS3587F | 20 | #define HAVE_MAS3587F |
15 | 21 | ||
@@ -64,3 +70,4 @@ | |||
64 | /* Define this for LCD backlight available */ | 70 | /* Define this for LCD backlight available */ |
65 | #define HAVE_BACKLIGHT | 71 | #define HAVE_BACKLIGHT |
66 | 72 | ||
73 | #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 @@ | |||
34 | #include "config-ondiosp.h" | 34 | #include "config-ondiosp.h" |
35 | #elif defined(ARCHOS_ONDIOFM) | 35 | #elif defined(ARCHOS_ONDIOFM) |
36 | #include "config-ondiofm.h" | 36 | #include "config-ondiofm.h" |
37 | #elif defined(IRIVER_H100) | ||
38 | #include "config-h100.h" | ||
37 | #else | 39 | #else |
38 | /* no known platform */ | 40 | /* no known platform */ |
39 | #endif | 41 | #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); | |||
105 | 105 | ||
106 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) | 106 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) |
107 | #if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR) | 107 | #if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR) |
108 | #define LCD_WIDTH (4*11*6) /* Display width in pixels */ | ||
109 | #define LCD_HEIGHT (4*16+2*24) /* 4*char + 2*icons */ | ||
110 | #else | ||
111 | #define LCD_WIDTH 112 /* Display width in pixels */ | ||
112 | #define LCD_HEIGHT 64 /* Display height in pixels */ | ||
113 | #endif | 108 | #endif |
114 | 109 | ||
115 | #define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7)) | 110 | #define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7)) |