diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 42 | ||||
-rw-r--r-- | firmware/drivers/lcd-h100.c | 10 | ||||
-rw-r--r-- | firmware/export/lcd.h | 71 |
3 files changed, 55 insertions, 68 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index 185f572182..1aed98e5f6 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c | |||
@@ -34,13 +34,11 @@ | |||
34 | 34 | ||
35 | #define SCROLLABLE_LINES 26 | 35 | #define SCROLLABLE_LINES 26 |
36 | 36 | ||
37 | #define RGB_PACK(r,g,b) (htobe16(((r)<<11)|((g)<<5)|(b))) | ||
38 | |||
39 | /*** globals ***/ | 37 | /*** globals ***/ |
40 | fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH] __attribute__ ((aligned (4))); | 38 | fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH] __attribute__ ((aligned (4))); |
41 | 39 | ||
42 | static unsigned fg_pattern; | 40 | static unsigned fg_pattern = LCD_DEFAULT_FG; |
43 | static unsigned bg_pattern; | 41 | static unsigned bg_pattern = LCD_DEFAULT_BG; |
44 | static int drawmode = DRMODE_SOLID; | 42 | static int drawmode = DRMODE_SOLID; |
45 | static int xmargin = 0; | 43 | static int xmargin = 0; |
46 | static int ymargin = 0; | 44 | static int ymargin = 0; |
@@ -72,9 +70,6 @@ int lcd_default_contrast(void) | |||
72 | /* LCD init */ | 70 | /* LCD init */ |
73 | void lcd_init(void) | 71 | void lcd_init(void) |
74 | { | 72 | { |
75 | fg_pattern = 0x0000; /* Black */ | ||
76 | bg_pattern = RGB_PACK(0x17, 0x31, 0x1d); /* "Rockbox blue" */ | ||
77 | |||
78 | lcd_clear_display(); | 73 | lcd_clear_display(); |
79 | /* Call device specific init */ | 74 | /* Call device specific init */ |
80 | lcd_init_device(); | 75 | lcd_init_device(); |
@@ -94,43 +89,32 @@ int lcd_get_drawmode(void) | |||
94 | return drawmode; | 89 | return drawmode; |
95 | } | 90 | } |
96 | 91 | ||
97 | void lcd_set_foreground(struct rgb color) | 92 | void lcd_set_foreground(unsigned color) |
98 | { | 93 | { |
99 | fg_pattern = RGB_PACK(color.red, color.green, color.blue); | 94 | fg_pattern = color; |
100 | } | 95 | } |
101 | 96 | ||
102 | struct rgb lcd_get_foreground(void) | 97 | unsigned lcd_get_foreground(void) |
103 | { | 98 | { |
104 | struct rgb colour; | 99 | return fg_pattern; |
105 | |||
106 | colour.red = (fg_pattern >> 11) & 0x1f; | ||
107 | colour.green = (fg_pattern >> 5) & 0x3f; | ||
108 | colour.blue = fg_pattern & 0x1f; | ||
109 | return colour; | ||
110 | } | 100 | } |
111 | 101 | ||
112 | void lcd_set_background(struct rgb color) | 102 | void lcd_set_background(unsigned color) |
113 | { | 103 | { |
114 | bg_pattern = RGB_PACK(color.red, color.green, color. blue); | 104 | bg_pattern = color; |
115 | } | 105 | } |
116 | 106 | ||
117 | 107 | ||
118 | struct rgb lcd_get_background(void) | 108 | unsigned lcd_get_background(void) |
119 | { | 109 | { |
120 | struct rgb colour; | 110 | return bg_pattern; |
121 | |||
122 | colour.red = (bg_pattern >> 11) & 0x1f; | ||
123 | colour.green = (bg_pattern >> 5) & 0x3f; | ||
124 | colour.blue = bg_pattern & 0x1f; | ||
125 | return colour; | ||
126 | } | 111 | } |
127 | 112 | ||
128 | void lcd_set_drawinfo(int mode, struct rgb fg_color, | 113 | void lcd_set_drawinfo(int mode, unsigned fg_color, unsigned bg_color) |
129 | struct rgb bg_color) | ||
130 | { | 114 | { |
131 | lcd_set_drawmode(mode); | 115 | lcd_set_drawmode(mode); |
132 | lcd_set_foreground(fg_color); | 116 | fg_pattern = fg_color; |
133 | lcd_set_background(bg_color); | 117 | bg_pattern = bg_color; |
134 | } | 118 | } |
135 | 119 | ||
136 | void lcd_setmargins(int x, int y) | 120 | void lcd_setmargins(int x, int y) |
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c index e8541f7621..1005cf6b5f 100644 --- a/firmware/drivers/lcd-h100.c +++ b/firmware/drivers/lcd-h100.c | |||
@@ -307,27 +307,27 @@ int lcd_get_drawmode(void) | |||
307 | return drawmode; | 307 | return drawmode; |
308 | } | 308 | } |
309 | 309 | ||
310 | void lcd_set_foreground(int brightness) | 310 | void lcd_set_foreground(unsigned brightness) |
311 | { | 311 | { |
312 | fg_pattern = 0x55 * (~brightness & 3); | 312 | fg_pattern = 0x55 * (~brightness & 3); |
313 | } | 313 | } |
314 | 314 | ||
315 | int lcd_get_foreground(void) | 315 | unsigned lcd_get_foreground(void) |
316 | { | 316 | { |
317 | return ~fg_pattern & 3; | 317 | return ~fg_pattern & 3; |
318 | } | 318 | } |
319 | 319 | ||
320 | void lcd_set_background(int brightness) | 320 | void lcd_set_background(unsigned brightness) |
321 | { | 321 | { |
322 | bg_pattern = 0x55 * (~brightness & 3); | 322 | bg_pattern = 0x55 * (~brightness & 3); |
323 | } | 323 | } |
324 | 324 | ||
325 | int lcd_get_background(void) | 325 | unsigned lcd_get_background(void) |
326 | { | 326 | { |
327 | return ~bg_pattern & 3; | 327 | return ~bg_pattern & 3; |
328 | } | 328 | } |
329 | 329 | ||
330 | void lcd_set_drawinfo(int mode, int fg_brightness, int bg_brightness) | 330 | void lcd_set_drawinfo(int mode, unsigned fg_brightness, unsigned bg_brightness) |
331 | { | 331 | { |
332 | lcd_set_drawmode(mode); | 332 | lcd_set_drawmode(mode); |
333 | lcd_set_foreground(fg_brightness); | 333 | lcd_set_foreground(fg_brightness); |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 2d04cec054..48244fe2a8 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 | |||
140 | 140 | ||
141 | #ifdef HAVE_LCD_COLOR | 141 | #ifdef HAVE_LCD_COLOR |
142 | #if LCD_DEPTH == 16 | 142 | #if LCD_DEPTH == 16 |
143 | #define LCD_MAX_RED ((1 << 5) - 1) | 143 | #define LCD_MAX_RED 31 |
144 | #define LCD_MAX_GREEN ((1 << 6) - 1) | 144 | #define LCD_MAX_GREEN 63 |
145 | #define LCD_MAX_BLUE ((1 << 5) - 1) | 145 | #define LCD_MAX_BLUE 31 |
146 | #define _RGBPACK(r, g, b) ( ((((r) * 31 + 127) / 255) << 11) \ | ||
147 | |((((g) * 63 + 127) / 255) << 5) \ | ||
148 | | (((b) * 31 + 127) / 255)) | ||
149 | #if (CONFIG_LCD == LCD_IPODCOLOR) || (CONFIG_LCD == LCD_IPODNANO) | ||
150 | #define LCD_RGBPACK(r, g, b) ( ((_RGBPACK((r), (g), (b)) & 0xff00) >> 8) \ | ||
151 | |((_RGBPACK((r), (g), (b)) & 0x00ff) << 8)) | ||
146 | #else | 152 | #else |
147 | #define LCD_MAX_RED ((1 << (LCD_DEPTH/3)) - 1) | 153 | #define LCD_RGBPACK(r, g, b) _RGBPACK((r), (g), (b)) |
148 | #define LCD_MAX_GREEN ((1 << (LCD_DEPTH/3)) - 1) | ||
149 | #define LCD_MAX_BLUE ((1 << (LCD_DEPTH/3)) - 1) | ||
150 | #endif | 154 | #endif |
151 | struct rgb { | 155 | #else |
152 | unsigned char red; | 156 | /* other colour depths */ |
153 | unsigned char green; | 157 | #endif |
154 | unsigned char blue; | 158 | |
155 | }; | 159 | #define LCD_BLACK LCD_RGBPACK(0, 0, 0) |
156 | #define LCD_BLACK ((struct rgb){0, 0, 0}) | 160 | #define LCD_DARKGRAY LCD_RGBPACK(85, 85, 85) |
157 | #define LCD_DARKGRAY ((struct rgb){LCD_MAX_RED/3, LCD_MAX_GREEN/3, LCD_MAX_BLUE/3}) | 161 | #define LCD_LIGHTGRAY LCD_RGBPACK(170, 170, 170) |
158 | #define LCD_LIGHTGRAY ((struct rgb){2*LCD_MAX_RED/3, 2*LCD_MAX_GREEN/3, 2*LCD_MAX_BLUE/3}) | 162 | #define LCD_WHITE LCD_RGBPACK(255, 255, 255) |
159 | #define LCD_WHITE ((struct rgb){LCD_MAX_RED, LCD_MAX_GREEN, LCD_MAX_BLUE}) | 163 | #define LCD_DEFAULT_FG LCD_BLACK |
160 | #else /* monochrome */ | 164 | #define LCD_DEFAULT_BG LCD_RGBPACK(182, 198, 229) /* rockbox blue */ |
165 | |||
166 | #elif LCD_DEPTH > 1 /* greyscale */ | ||
161 | #define LCD_MAX_LEVEL ((1 << LCD_DEPTH) - 1) | 167 | #define LCD_MAX_LEVEL ((1 << LCD_DEPTH) - 1) |
162 | #define LCD_BLACK 0 | 168 | #define LCD_BRIGHTNESS(y) (((y) * LCD_MAX_LEVEL + 127) / 255) |
163 | #define LCD_DARKGRAY (LCD_MAX_LEVEL/3) | 169 | |
164 | #define LCD_LIGHTGRAY (2*LCD_MAX_LEVEL/3) | 170 | #define LCD_BLACK LCD_BRIGHTNESS(0) |
165 | #define LCD_WHITE LCD_MAX_LEVEL | 171 | #define LCD_DARKGRAY LCD_BRIGHTNESS(85) |
172 | #define LCD_LIGHTGRAY LCD_BRIGHTNESS(170) | ||
173 | #define LCD_WHITE LCD_BRIGHTNESS(255) | ||
174 | #define LCD_DEFAULT_FG LCD_BLACK | ||
175 | #define LCD_DEFAULT_BG LCD_WHITE | ||
166 | #endif | 176 | #endif |
167 | 177 | ||
168 | /* Memory copy of display bitmap */ | 178 | /* Memory copy of display bitmap */ |
@@ -207,20 +217,13 @@ extern void lcd_bidir_scroll(int threshold); | |||
207 | extern void lcd_scroll_step(int pixels); | 217 | extern void lcd_scroll_step(int pixels); |
208 | 218 | ||
209 | #if LCD_DEPTH > 1 | 219 | #if LCD_DEPTH > 1 |
210 | #ifdef HAVE_LCD_COLOR | 220 | extern void lcd_set_foreground(unsigned foreground); |
211 | extern void lcd_set_foreground(struct rgb color); | 221 | extern unsigned lcd_get_foreground(void); |
212 | extern struct rgb lcd_get_foreground(void); | 222 | extern void lcd_set_background(unsigned background); |
213 | extern void lcd_set_background(struct rgb color); | 223 | extern unsigned lcd_get_background(void); |
214 | extern struct rgb lcd_get_background(void); | 224 | extern void lcd_set_drawinfo(int mode, unsigned foreground, |
215 | extern void lcd_set_drawinfo(int mode, struct rgb fg_color, | 225 | unsigned background); |
216 | struct rgb bg_color); | 226 | |
217 | #else /* monochrome */ | ||
218 | extern void lcd_set_foreground(int brightness); | ||
219 | extern int lcd_get_foreground(void); | ||
220 | extern void lcd_set_background(int brightness); | ||
221 | extern int lcd_get_background(void); | ||
222 | extern void lcd_set_drawinfo(int mode, int fg_brightness, int bg_brightness); | ||
223 | #endif | ||
224 | extern void lcd_mono_bitmap_part(const unsigned char *src, int src_x, int src_y, | 227 | extern void lcd_mono_bitmap_part(const unsigned char *src, int src_x, int src_y, |
225 | int stride, int x, int y, int width, int height); | 228 | int stride, int x, int y, int width, int height); |
226 | extern void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width, | 229 | extern void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width, |