diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-11-15 23:37:21 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-11-15 23:37:21 +0000 |
commit | 3be6cf15742083b9786fba52d40f61e5803db840 (patch) | |
tree | 0813b8c21260c62b916f1fe99f76e1bf30e1f21a /firmware/drivers | |
parent | 2691d760737c591cf368e9c4e90b1f96b973cfcc (diff) | |
download | rockbox-3be6cf15742083b9786fba52d40f61e5803db840.tar.gz rockbox-3be6cf15742083b9786fba52d40f61e5803db840.zip |
16bit colour support (H300) for the win32 simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7898 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 6 | ||||
-rw-r--r-- | firmware/drivers/lcd-h300.c | 10 | ||||
-rw-r--r-- | firmware/drivers/lcd-ipod.c | 4 |
3 files changed, 6 insertions, 14 deletions
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] = { | |||
63 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 | 63 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 |
64 | }; | 64 | }; |
65 | 65 | ||
66 | /* probably just a dummy */ | ||
67 | int lcd_default_contrast(void) | ||
68 | { | ||
69 | return 28; | ||
70 | } | ||
71 | |||
66 | /* LCD init */ | 72 | /* LCD init */ |
67 | void lcd_init(void) | 73 | void lcd_init(void) |
68 | { | 74 | { |
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) | |||
49 | 49 | ||
50 | /*** hardware configuration ***/ | 50 | /*** hardware configuration ***/ |
51 | 51 | ||
52 | int lcd_default_contrast(void) | ||
53 | { | ||
54 | return 28; | ||
55 | } | ||
56 | |||
57 | #ifndef SIMULATOR | ||
58 | |||
59 | void lcd_set_contrast(int val) | 52 | void lcd_set_contrast(int val) |
60 | { | 53 | { |
61 | (void)val; | 54 | (void)val; |
@@ -84,10 +77,8 @@ void lcd_roll(int lines) | |||
84 | (void)lines; | 77 | (void)lines; |
85 | } | 78 | } |
86 | 79 | ||
87 | #endif /* !SIMULATOR */ | ||
88 | 80 | ||
89 | /* LCD init */ | 81 | /* LCD init */ |
90 | #ifndef SIMULATOR | ||
91 | void lcd_init_device(void) | 82 | void lcd_init_device(void) |
92 | { | 83 | { |
93 | /* GPO46 is LCD RESET */ | 84 | /* GPO46 is LCD RESET */ |
@@ -216,4 +207,3 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
216 | lcd_write_data ((unsigned short *)&lcd_framebuffer[y][x], width); | 207 | lcd_write_data ((unsigned short *)&lcd_framebuffer[y][x], width); |
217 | } | 208 | } |
218 | } | 209 | } |
219 | #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) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | /*** hardware configuration ***/ | 122 | /*** hardware configuration ***/ |
123 | int lcd_default_contrast(void) | ||
124 | { | ||
125 | return 28; | ||
126 | } | ||
127 | 123 | ||
128 | void lcd_set_contrast(int val) | 124 | void lcd_set_contrast(int val) |
129 | { | 125 | { |