From 3be6cf15742083b9786fba52d40f61e5803db840 Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Tue, 15 Nov 2005 23:37:21 +0000
Subject: 16bit colour support (H300) for the win32 simulator.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7898 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/lcd-16bit.c |  6 ++++++
 firmware/drivers/lcd-h300.c  | 10 ----------
 firmware/drivers/lcd-ipod.c  |  4 ----
 3 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'firmware/drivers')

diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index fb5e0ccbb8..9f698bbacd 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -63,6 +63,12 @@ static const char scroll_tick_table[16] = {
     100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
 };
 
+/* probably just a dummy */
+int lcd_default_contrast(void)
+{
+    return 28;
+}
+
 /* LCD init */
 void lcd_init(void)
 {
diff --git a/firmware/drivers/lcd-h300.c b/firmware/drivers/lcd-h300.c
index 1e71da59a8..4edfe404b3 100644
--- a/firmware/drivers/lcd-h300.c
+++ b/firmware/drivers/lcd-h300.c
@@ -49,13 +49,6 @@ void lcd_write_data(const unsigned short* p_bytes, int count)
 
 /*** hardware configuration ***/
 
-int lcd_default_contrast(void)
-{
-    return 28;
-}
-
-#ifndef SIMULATOR
-
 void lcd_set_contrast(int val)
 {
     (void)val;
@@ -84,10 +77,8 @@ void lcd_roll(int lines)
     (void)lines;
 }
 
-#endif /* !SIMULATOR */
 
 /* LCD init */
-#ifndef SIMULATOR
 void lcd_init_device(void)
 {
     /* GPO46 is LCD RESET */
@@ -216,4 +207,3 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_write_data ((unsigned short *)&lcd_framebuffer[y][x], width);
     }
 }
-#endif /* !SIMULATOR */
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c
index 69272ccccf..f7a21044bb 100644
--- a/firmware/drivers/lcd-ipod.c
+++ b/firmware/drivers/lcd-ipod.c
@@ -120,10 +120,6 @@ static void lcd_cmd_data(int cmd, int data)
 }
 
 /*** hardware configuration ***/
-int lcd_default_contrast(void)
-{
-    return 28;
-}
 
 void lcd_set_contrast(int val)
 {
-- 
cgit v1.2.3