summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2005-11-14 21:54:16 +0000
committerDave Chapman <dave@dchapman.com>2005-11-14 21:54:16 +0000
commitae7c55c12c27b2e94a43db180188070a9ec42a21 (patch)
tree39f35993ea2eb0f5ec53810e6ecac3e8357496a2 /firmware/drivers
parentb6c0f9596024baa5265e29734cc5d8686d81e950 (diff)
downloadrockbox-ae7c55c12c27b2e94a43db180188070a9ec42a21.tar.gz
rockbox-ae7c55c12c27b2e94a43db180188070a9ec42a21.zip
Fix compile error on iPod build - RGB_PACK resolves to a function on the iPod, so can't be used in an initialiser.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7882 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/lcd-16bit.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 9e2bf11446..c2ff99539b 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -39,8 +39,8 @@
39/*** globals ***/ 39/*** globals ***/
40fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH] __attribute__ ((aligned (2))); 40fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH] __attribute__ ((aligned (2)));
41 41
42static unsigned fg_pattern = 0x0000; /* Black */ 42static unsigned fg_pattern;
43static unsigned bg_pattern = RGB_PACK(0xb6, 0xc6, 0xe5); /* "Rockbox blue" */ 43static unsigned bg_pattern;
44static int drawmode = DRMODE_SOLID; 44static int drawmode = DRMODE_SOLID;
45static int xmargin = 0; 45static int xmargin = 0;
46static int ymargin = 0; 46static int ymargin = 0;
@@ -66,6 +66,9 @@ static const char scroll_tick_table[16] = {
66/* LCD init */ 66/* LCD init */
67void lcd_init(void) 67void lcd_init(void)
68{ 68{
69 fg_pattern = 0x0000; /* Black */
70 bg_pattern = RGB_PACK(0xb6, 0xc6, 0xe5); /* "Rockbox blue" */
71
69 lcd_clear_display(); 72 lcd_clear_display();
70 /* Call device specific init */ 73 /* Call device specific init */
71 lcd_init_device(); 74 lcd_init_device();