Changed the LCD_COLOR pixel value format to packed RGB (unsigned int). Now all LCDs with depth > 1 use the same datatype. Added macros for easy pixel value definition.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7912 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 55 insertions, 68 deletions

diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 185f572..1aed98e 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -34,13 +34,11 @@
 
 #define SCROLLABLE_LINES 26
 
-#define RGB_PACK(r,g,b) (htobe16(((r)<<11)|((g)<<5)|(b)))
-
 /*** globals ***/
 fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH] __attribute__ ((aligned (4)));
 
-static unsigned fg_pattern;
-static unsigned bg_pattern;
+static unsigned fg_pattern = LCD_DEFAULT_FG;
+static unsigned bg_pattern = LCD_DEFAULT_BG;
 static int drawmode = DRMODE_SOLID;
 static int xmargin = 0;
 static int ymargin = 0;
@@ -72,9 +70,6 @@ int lcd_default_contrast(void)
 /* LCD init */
 void lcd_init(void)
 {
-    fg_pattern = 0x0000; /* Black */
-    bg_pattern = RGB_PACK(0x17, 0x31, 0x1d); /* "Rockbox blue" */
-
     lcd_clear_display();
     /* Call device specific init */
     lcd_init_device();
@@ -94,43 +89,32 @@ int lcd_get_drawmode(void)
     return drawmode;
 }
 
-void lcd_set_foreground(struct rgb color)
+void lcd_set_foreground(unsigned color)
 {
-    fg_pattern = RGB_PACK(color.red, color.green, color.blue);
+    fg_pattern = color;
 }
 
-struct rgb lcd_get_foreground(void)
+unsigned lcd_get_foreground(void)
 {
-    struct rgb colour;
-
-    colour.red   = (fg_pattern >> 11) & 0x1f;
-    colour.green = (fg_pattern >> 5) & 0x3f;
-    colour.blue  =  fg_pattern & 0x1f;
-    return colour;
+    return fg_pattern;
 }
 
-void lcd_set_background(struct rgb color)
+void lcd_set_background(unsigned color)
 {
-    bg_pattern = RGB_PACK(color.red, color.green, color. blue);
+    bg_pattern = color;
 }
 
 
-struct rgb lcd_get_background(void)
+unsigned lcd_get_background(void)
 {
-    struct rgb colour;
-
-    colour.red   = (bg_pattern >> 11) & 0x1f;
-    colour.green = (bg_pattern >> 5) & 0x3f;
-    colour.blue  =  bg_pattern & 0x1f;
-    return colour;
+    return bg_pattern;
 }
 
-void lcd_set_drawinfo(int mode, struct rgb fg_color,
-                                struct rgb bg_color)
+void lcd_set_drawinfo(int mode, unsigned fg_color, unsigned bg_color)
 {
     lcd_set_drawmode(mode);
-    lcd_set_foreground(fg_color);
-    lcd_set_background(bg_color);
+    fg_pattern = fg_color;
+    bg_pattern = bg_color;
 }
 
 void lcd_setmargins(int x, int y)
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c
index e8541f7..1005cf6 100644
--- a/firmware/drivers/lcd-h100.c
+++ b/firmware/drivers/lcd-h100.c
@@ -307,27 +307,27 @@ int lcd_get_drawmode(void)
     return drawmode;
 }
 
-void lcd_set_foreground(int brightness)
+void lcd_set_foreground(unsigned brightness)
 {
     fg_pattern = 0x55 * (~brightness & 3);
 }
 
-int lcd_get_foreground(void)
+unsigned lcd_get_foreground(void)
 {
     return ~fg_pattern & 3;
 }
 
-void lcd_set_background(int brightness)
+void lcd_set_background(unsigned brightness)
 {
     bg_pattern = 0x55 * (~brightness & 3);
 }
 
-int lcd_get_background(void)
+unsigned lcd_get_background(void)
 {
     return ~bg_pattern & 3;
 }
 
-void lcd_set_drawinfo(int mode, int fg_brightness, int bg_brightness)
+void lcd_set_drawinfo(int mode, unsigned fg_brightness, unsigned bg_brightness)
 {
     lcd_set_drawmode(mode);
     lcd_set_foreground(fg_brightness);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 2d04cec..48244fe 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -140,29 +140,39 @@ typedef void lcd_blockfunc_type(unsigned char *address, unsigned mask, unsigned
 
 #ifdef HAVE_LCD_COLOR
 #if LCD_DEPTH == 16
-#define LCD_MAX_RED   ((1 << 5) - 1)
-#define LCD_MAX_GREEN ((1 << 6) - 1)
-#define LCD_MAX_BLUE  ((1 << 5) - 1)
+#define LCD_MAX_RED    31
+#define LCD_MAX_GREEN  63
+#define LCD_MAX_BLUE   31
+#define _RGBPACK(r, g, b) ( ((((r) * 31 + 127) / 255) << 11) \
+                           |((((g) * 63 + 127) / 255) << 5) \
+                           | (((b) * 31 + 127) / 255))
+#if (CONFIG_LCD == LCD_IPODCOLOR) || (CONFIG_LCD == LCD_IPODNANO)
+#define LCD_RGBPACK(r, g, b) ( ((_RGBPACK((r), (g), (b)) & 0xff00) >> 8) \
+                              |((_RGBPACK((r), (g), (b)) & 0x00ff) << 8))
 #else
-#define LCD_MAX_RED   ((1 << (LCD_DEPTH/3)) - 1)
-#define LCD_MAX_GREEN ((1 << (LCD_DEPTH/3)) - 1)
-#define LCD_MAX_BLUE  ((1 << (LCD_DEPTH/3)) - 1)
+#define LCD_RGBPACK(r, g, b) _RGBPACK((r), (g), (b))
 #endif
-struct rgb {
-    unsigned char red;
-    unsigned char green;
-    unsigned char blue;
-};
-#define LCD_BLACK ((struct rgb){0, 0, 0})
-#define LCD_DARKGRAY ((struct rgb){LCD_MAX_RED/3, LCD_MAX_GREEN/3, LCD_MAX_BLUE/3})
-#define LCD_LIGHTGRAY ((struct rgb){2*LCD_MAX_RED/3, 2*LCD_MAX_GREEN/3, 2*LCD_MAX_BLUE/3})
-#define LCD_WHITE ((struct rgb){LCD_MAX_RED, LCD_MAX_GREEN, LCD_MAX_BLUE})
-#else /* monochrome */
+#else
+/* other colour depths */
+#endif 
+
+#define LCD_BLACK      LCD_RGBPACK(0, 0, 0)
+#define LCD_DARKGRAY   LCD_RGBPACK(85, 85, 85)
+#define LCD_LIGHTGRAY  LCD_RGBPACK(170, 170, 170)
+#define LCD_WHITE      LCD_RGBPACK(255, 255, 255)
+#define LCD_DEFAULT_FG LCD_BLACK
+#define LCD_DEFAULT_BG LCD_RGBPACK(182, 198, 229) /* rockbox blue */
+
+#elif LCD_DEPTH > 1 /* greyscale */
 #define LCD_MAX_LEVEL ((1 << LCD_DEPTH) - 1)
-#define LCD_BLACK 0
-#define LCD_DARKGRAY (LCD_MAX_LEVEL/3)
-#define LCD_LIGHTGRAY (2*LCD_MAX_LEVEL/3)
-#define LCD_WHITE LCD_MAX_LEVEL
+#define LCD_BRIGHTNESS(y) (((y) * LCD_MAX_LEVEL + 127) / 255)
+
+#define LCD_BLACK      LCD_BRIGHTNESS(0)
+#define LCD_DARKGRAY   LCD_BRIGHTNESS(85)
+#define LCD_LIGHTGRAY  LCD_BRIGHTNESS(170)
+#define LCD_WHITE      LCD_BRIGHTNESS(255)
+#define LCD_DEFAULT_FG LCD_BLACK
+#define LCD_DEFAULT_BG LCD_WHITE
 #endif
 
 /* Memory copy of display bitmap */
@@ -207,20 +217,13 @@ extern void lcd_bidir_scroll(int threshold);
 extern void lcd_scroll_step(int pixels);
 
 #if LCD_DEPTH > 1
-#ifdef HAVE_LCD_COLOR
-extern void       lcd_set_foreground(struct rgb color);
-extern struct rgb lcd_get_foreground(void);
-extern void       lcd_set_background(struct rgb color);
-extern struct rgb lcd_get_background(void);
-extern void       lcd_set_drawinfo(int mode, struct rgb fg_color,
-                                   struct rgb bg_color);
-#else /* monochrome */
-extern void lcd_set_foreground(int brightness);
-extern int  lcd_get_foreground(void);
-extern void lcd_set_background(int brightness);
-extern int  lcd_get_background(void);
-extern void lcd_set_drawinfo(int mode, int fg_brightness, int bg_brightness);
-#endif
+extern void     lcd_set_foreground(unsigned foreground);
+extern unsigned lcd_get_foreground(void);
+extern void     lcd_set_background(unsigned background);
+extern unsigned lcd_get_background(void);
+extern void     lcd_set_drawinfo(int mode, unsigned foreground,
+                                 unsigned background);
+
 extern void lcd_mono_bitmap_part(const unsigned char *src, int src_x, int src_y,
                             int stride, int x, int y, int width, int height);
 extern void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width,