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

2 files changed, 10 insertions, 10 deletions

diff --git a/apps/plugins/lib/gray.h b/apps/plugins/lib/gray.h
index dadac9298f..f82cf389c3 100644
--- a/apps/plugins/lib/gray.h
+++ b/apps/plugins/lib/gray.h
@@ -51,11 +51,11 @@ void gray_update_rect(int x, int y, int width, int height);
 void gray_set_position(int x, int by);
 void gray_set_drawmode(int mode);
 int  gray_get_drawmode(void);
-void gray_set_foreground(int brightness);
-int  gray_get_foreground(void);
-void gray_set_background(int brightness);
-int  gray_get_background(void);
-void gray_set_drawinfo(int mode, int fg_brightness, int bg_brightness);
+void gray_set_foreground(unsigned brightness);
+unsigned gray_get_foreground(void);
+void gray_set_background(unsigned brightness);
+unsigned gray_get_background(void);
+void gray_set_drawinfo(int mode, unsigned fg_brightness, unsigned bg_brightness);
 void gray_setfont(int newfont);
 int  gray_getstringsize(const unsigned char *str, int *w, int *h);
 
diff --git a/apps/plugins/lib/gray_parm.c b/apps/plugins/lib/gray_parm.c
index a8c238a4eb..c4ee92f9cc 100644
--- a/apps/plugins/lib/gray_parm.c
+++ b/apps/plugins/lib/gray_parm.c
@@ -53,7 +53,7 @@ int  gray_get_drawmode(void)
 }
 
 /* Set the foreground shade for subsequent drawing operations */
-void gray_set_foreground(int brightness)
+void gray_set_foreground(unsigned brightness)
 {
     unsigned data = MULU16(_gray_info.depth, brightness & 0xFF) + 127;
 
@@ -61,14 +61,14 @@ void gray_set_foreground(int brightness)
 }
 
 /* Return the current foreground shade */
-int  gray_get_foreground(void)
+unsigned gray_get_foreground(void)
 {
     return (_gray_info.fg_brightness * 255 + (_gray_info.depth >> 1))
            / _gray_info.depth;
 }
 
 /* Set the background shade for subsequent drawing operations */
-void gray_set_background(int brightness)
+void gray_set_background(unsigned brightness)
 {
     unsigned data = MULU16(_gray_info.depth, brightness & 0xFF) + 127;
 
@@ -76,14 +76,14 @@ void gray_set_background(int brightness)
 }
 
 /* Return the current background shade */
-int  gray_get_background(void)
+unsigned gray_get_background(void)
 {
     return (_gray_info.bg_brightness * 255 + (_gray_info.depth >> 1))
            / _gray_info.depth;
 }
 
 /* Set draw mode, foreground and background shades at once */
-void gray_set_drawinfo(int mode, int fg_brightness, int bg_brightness)
+void gray_set_drawinfo(int mode, unsigned fg_brightness, unsigned bg_brightness)
 {
     gray_set_drawmode(mode);
     gray_set_foreground(fg_brightness);