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

2 files changed, 9 insertions, 2 deletions

diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h
index 3556e09d38..efac5bb893 100644
--- a/firmware/export/config-iaudiom3.h
+++ b/firmware/export/config-iaudiom3.h
@@ -45,7 +45,7 @@
 #define LCD_HEIGHT 96
 #define LCD_DEPTH  2
 
-#define LCD_PIXELFORMAT VERTICAL_INTRLEAVED
+#define LCD_PIXELFORMAT VERTICAL_INTERLEAVED
 
 #define CONFIG_KEYPAD IAUDIO_M3_PAD
 
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