summaryrefslogtreecommitdiff
path: root/firmware/export/lcd.h
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-03-12 20:35:42 +0000
committerJens Arnold <amiconn@rockbox.org>2008-03-12 20:35:42 +0000
commit769fcbd4d9425d0de1fa1628acdce1a2ffbdcd98 (patch)
tree91b000f711fc6f4037768013d20c0f788794a029 /firmware/export/lcd.h
parent78017a0b3861a3238ac7845f7be95a5e5b981fe4 (diff)
More iAudio M3 work. Bootloader compiles, but doesn't work yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16645 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/lcd.h')
-rw-r--r--firmware/export/lcd.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 669ef67f02..a6ecc975c2 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -71,7 +71,12 @@ struct viewport {
#endif /* SIMULATOR */
#if LCD_DEPTH <=8
+#if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \
+ || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED)
+typedef unsigned short fb_data;
+#else
typedef unsigned char fb_data;
+#endif
#elif LCD_DEPTH <= 16
typedef unsigned short fb_data;
#else /* LCD_DEPTH > 16 */
@@ -303,8 +308,10 @@ static inline unsigned lcd_color_to_native(unsigned color)
#elif LCD_DEPTH == 2
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
#define LCD_FBWIDTH ((LCD_WIDTH+3)/4)
-#else /* LCD_PIXELFORMAT == VERTICAL_PACKING */
+#elif LCD_PIXELFORMAT == VERTICAL_PACKING
#define LCD_FBHEIGHT ((LCD_HEIGHT+3)/4)
+#elif LCD_PIXELFORMAT == VERTICAL_INTERLEAVED
+#define LCD_FBHEIGHT ((LCD_HEIGHT+7)/8)
#endif /* LCD_PIXELFORMAT */
#endif /* LCD_DEPTH */
/* Set defaults if not defined different yet. The defaults apply to both