summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-03-29 23:50:56 +0000
committerThomas Martitz <kugel@rockbox.org>2009-03-29 23:50:56 +0000
commitddc554f62bb99a00b534e5f18aa0f1165df0622f (patch)
tree8b0cdc8f943df11a2920bdc3d8c286460d3faa91
parent148b0e98fc1361111364a13e64897319735ed4a0 (diff)
downloadrockbox-ddc554f62bb99a00b534e5f18aa0f1165df0622f.tar.gz
rockbox-ddc554f62bb99a00b534e5f18aa0f1165df0622f.zip
Correct some preprocessor checks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20573 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/lcd-e200.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index eebd678b83..702f95bba9 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -427,7 +427,15 @@ void lcd_init_device(void)
427 427
428 LCD_REG_6 |= 1; /* Start DMA */ 428 LCD_REG_6 |= 1; /* Start DMA */
429} 429}
430
430#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 431#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
432bool lcd_active(void)
433{
434 return display_on;
435}
436#endif
437
438#if defined(HAVE_LCD_ENABLE)
431void lcd_enable(bool on) 439void lcd_enable(bool on)
432{ 440{
433 if (on == display_on) 441 if (on == display_on)
@@ -450,12 +458,9 @@ void lcd_enable(bool on)
450 DEV_EN &= ~DEV_LCD; /* Disable LCD controller */ 458 DEV_EN &= ~DEV_LCD; /* Disable LCD controller */
451 } 459 }
452} 460}
453
454bool lcd_active(void)
455{
456 return display_on;
457}
458#endif 461#endif
462
463#if defined(HAVE_LCD_SLEEP)
459void lcd_sleep(void) 464void lcd_sleep(void)
460{ 465{
461 LCD_REG_6 &= ~1; 466 LCD_REG_6 &= ~1;
@@ -474,6 +479,7 @@ void lcd_sleep(void)
474 /* SAP2-0=000, BT2-0=000, AP2-0=000, DK=0, SLP=0, STB=1 */ 479 /* SAP2-0=000, BT2-0=000, AP2-0=000, DK=0, SLP=0, STB=1 */
475 lcd_write_reg(R_POWER_CONTROL1, 0x0001); 480 lcd_write_reg(R_POWER_CONTROL1, 0x0001);
476} 481}
482#endif
477 483
478/* Copies a rectangle from one framebuffer to another. Can be used in 484/* Copies a rectangle from one framebuffer to another. Can be used in
479 single transfer mode with width = num pixels, and height = 1 which 485 single transfer mode with width = num pixels, and height = 1 which