diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 03:36:36 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 03:36:36 +0000 |
commit | 4ed387d60313ac79fa7ac8b403bf3195f7c0c549 (patch) | |
tree | d5bc4861cbdde61b054d12deed4ffea92af03bd3 /firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | |
parent | 68f9ef2d575c4d6801730a0a8242227383d682f7 (diff) | |
download | rockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.tar.gz rockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.zip |
Fix reds and yellows (hopefully). Some targets apparently didn't properly #ifdef lcd_enable and lcd_sleep code out, so that it got partly active in the bootloader; rename the ui simulator stub fixes most reds; for the clip: move the hook code into lcd-1bit-vert.c which should fix the bootloader red.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20333 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c index fd52eda5e9..46aac24e60 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | |||
@@ -42,10 +42,12 @@ extern struct viewport* current_vp; | |||
42 | extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src, | 42 | extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src, |
43 | int width, int height); | 43 | int width, int height); |
44 | 44 | ||
45 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
45 | bool lcd_active(void) | 46 | bool lcd_active(void) |
46 | { | 47 | { |
47 | return lcd_on; | 48 | return lcd_on; |
48 | } | 49 | } |
50 | #endif | ||
49 | 51 | ||
50 | static unsigned int LCDBANK(unsigned int address) | 52 | static unsigned int LCDBANK(unsigned int address) |
51 | { | 53 | { |
@@ -278,6 +280,7 @@ void lcd_init_device(void) | |||
278 | LCD_SPI_init(); | 280 | LCD_SPI_init(); |
279 | } | 281 | } |
280 | 282 | ||
283 | #if defined(HAVE_LCD_SLEEP) | ||
281 | void lcd_sleep(void) | 284 | void lcd_sleep(void) |
282 | { | 285 | { |
283 | if (lcd_powered) | 286 | if (lcd_powered) |
@@ -289,7 +292,9 @@ void lcd_sleep(void) | |||
289 | LCD_SPI_powerdown(); | 292 | LCD_SPI_powerdown(); |
290 | } | 293 | } |
291 | } | 294 | } |
295 | #endif | ||
292 | 296 | ||
297 | #if defined(HAVE_LCD_ENABLE) | ||
293 | void lcd_enable(bool state) | 298 | void lcd_enable(bool state) |
294 | { | 299 | { |
295 | if (state == lcd_on) | 300 | if (state == lcd_on) |
@@ -315,6 +320,7 @@ void lcd_enable(bool state) | |||
315 | lcd_on = false; | 320 | lcd_on = false; |
316 | } | 321 | } |
317 | } | 322 | } |
323 | #endif | ||
318 | 324 | ||
319 | void lcd_set_flip(bool yesno) { | 325 | void lcd_set_flip(bool yesno) { |
320 | if (!lcd_on) | 326 | if (!lcd_on) |