diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-h100.h | 2 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipod3g.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipod4g.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipodcolor.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodnano.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodvideo.h | 2 | ||||
-rw-r--r-- | firmware/export/config.h | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 6 |
9 files changed, 24 insertions, 2 deletions
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index ea49dd8e2c..b9677b5fb2 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -18,6 +18,8 @@ | |||
18 | #define LCD_HEIGHT 128 | 18 | #define LCD_HEIGHT 128 |
19 | #define LCD_DEPTH 2 | 19 | #define LCD_DEPTH 2 |
20 | 20 | ||
21 | #define LCD_PIXELFORMAT VERTICAL_PACKING | ||
22 | |||
21 | /* remote LCD */ | 23 | /* remote LCD */ |
22 | #define LCD_REMOTE_WIDTH 128 | 24 | #define LCD_REMOTE_WIDTH 128 |
23 | #define LCD_REMOTE_HEIGHT 64 | 25 | #define LCD_REMOTE_HEIGHT 64 |
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index fee5f4862c..252d3c1af8 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -14,6 +14,8 @@ | |||
14 | #define LCD_HEIGHT 128 | 14 | #define LCD_HEIGHT 128 |
15 | #define LCD_DEPTH 2 | 15 | #define LCD_DEPTH 2 |
16 | 16 | ||
17 | #define LCD_PIXELFORMAT VERTICAL_PACKING | ||
18 | |||
17 | /* remote LCD */ | 19 | /* remote LCD */ |
18 | #define LCD_REMOTE_WIDTH 128 | 20 | #define LCD_REMOTE_WIDTH 128 |
19 | #define LCD_REMOTE_HEIGHT 64 | 21 | #define LCD_REMOTE_HEIGHT 64 |
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 0da104d38b..9d55b6b3f0 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h | |||
@@ -3,6 +3,8 @@ | |||
3 | */ | 3 | */ |
4 | #define APPLE_IPOD3G 1 | 4 | #define APPLE_IPOD3G 1 |
5 | 5 | ||
6 | #define IPOD_ARCH 1 | ||
7 | |||
6 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 7 | 9 | #define MODEL_NUMBER 7 |
8 | 10 | ||
@@ -17,6 +19,8 @@ | |||
17 | #define LCD_HEIGHT 128 | 19 | #define LCD_HEIGHT 128 |
18 | #define LCD_DEPTH 2 /* 4 colours - 2bpp */ | 20 | #define LCD_DEPTH 2 /* 4 colours - 2bpp */ |
19 | 21 | ||
22 | #define LCD_PIXELFORMAT HORIZONTAL_PACKING | ||
23 | |||
20 | #define CONFIG_KEYPAD IPOD_3G_PAD | 24 | #define CONFIG_KEYPAD IPOD_3G_PAD |
21 | 25 | ||
22 | /* Define this if you do software codec */ | 26 | /* Define this if you do software codec */ |
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index de0388dbb1..7195f207e1 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h | |||
@@ -3,6 +3,8 @@ | |||
3 | */ | 3 | */ |
4 | #define APPLE_IPOD4G 1 | 4 | #define APPLE_IPOD4G 1 |
5 | 5 | ||
6 | #define IPOD_ARCH 1 | ||
7 | |||
6 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 8 | 9 | #define MODEL_NUMBER 8 |
8 | 10 | ||
@@ -17,6 +19,8 @@ | |||
17 | #define LCD_HEIGHT 128 | 19 | #define LCD_HEIGHT 128 |
18 | #define LCD_DEPTH 2 /* 4 colours - 2bpp */ | 20 | #define LCD_DEPTH 2 /* 4 colours - 2bpp */ |
19 | 21 | ||
22 | #define LCD_PIXELFORMAT HORIZONTAL_PACKING | ||
23 | |||
20 | #define CONFIG_KEYPAD IPOD_4G_PAD | 24 | #define CONFIG_KEYPAD IPOD_4G_PAD |
21 | 25 | ||
22 | /* Define this if you do software codec */ | 26 | /* Define this if you do software codec */ |
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index b413b8681c..9cbc058d8f 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h | |||
@@ -3,6 +3,8 @@ | |||
3 | */ | 3 | */ |
4 | #define APPLE_IPODCOLOR 1 | 4 | #define APPLE_IPODCOLOR 1 |
5 | 5 | ||
6 | #define IPOD_ARCH 1 | ||
7 | |||
6 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 3 | 9 | #define MODEL_NUMBER 3 |
8 | 10 | ||
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 728c83ef9f..1843d1809c 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
@@ -3,6 +3,8 @@ | |||
3 | */ | 3 | */ |
4 | #define APPLE_IPODNANO 1 | 4 | #define APPLE_IPODNANO 1 |
5 | 5 | ||
6 | #define IPOD_ARCH 1 | ||
7 | |||
6 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 4 | 9 | #define MODEL_NUMBER 4 |
8 | 10 | ||
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 0e6dc153bb..160a2db383 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
@@ -3,6 +3,8 @@ | |||
3 | */ | 3 | */ |
4 | #define APPLE_IPODVIDEO 1 | 4 | #define APPLE_IPODVIDEO 1 |
5 | 5 | ||
6 | #define IPOD_ARCH 1 | ||
7 | |||
6 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 5 | 9 | #define MODEL_NUMBER 5 |
8 | 10 | ||
diff --git a/firmware/export/config.h b/firmware/export/config.h index 22352f5e53..b1cca7b288 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -82,6 +82,8 @@ | |||
82 | #define LCD_IFP7XX 10 /* as used by iRiver iFP 7xx/8xx */ | 82 | #define LCD_IFP7XX 10 /* as used by iRiver iFP 7xx/8xx */ |
83 | 83 | ||
84 | /* LCD_PIXELFORMAT */ | 84 | /* LCD_PIXELFORMAT */ |
85 | #define HORIZONTAL_PACKING 1 | ||
86 | #define VERTICAL_PACKING 2 | ||
85 | #define RGB565 565 | 87 | #define RGB565 565 |
86 | #define RGB565SWAPPED 3553 | 88 | #define RGB565SWAPPED 3553 |
87 | 89 | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index bee8d3cd0c..d56f39d09c 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -192,10 +192,12 @@ typedef void lcd_fastpixelfunc_type(fb_data *address); | |||
192 | /* Memory copy of display bitmap */ | 192 | /* Memory copy of display bitmap */ |
193 | #if LCD_DEPTH == 1 | 193 | #if LCD_DEPTH == 1 |
194 | extern fb_data lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; | 194 | extern fb_data lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; |
195 | #elif CONFIG_LCD == LCD_IPOD2BPP | ||
196 | extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH/4]; | ||
197 | #elif LCD_DEPTH == 2 | 195 | #elif LCD_DEPTH == 2 |
196 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING | ||
197 | extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH/4]; | ||
198 | #else | ||
198 | extern fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH]; | 199 | extern fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH]; |
200 | #endif | ||
199 | #elif LCD_DEPTH == 16 | 201 | #elif LCD_DEPTH == 16 |
200 | extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH]; | 202 | extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH]; |
201 | #elif LCD_DEPTH == 18 | 203 | #elif LCD_DEPTH == 18 |