diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 04:22:28 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 04:22:28 +0000 |
commit | d0e834aa7349fab6367e74d0df88575dfd854496 (patch) | |
tree | bc4487049a425e7dd9c26426641fee5f827ac2bf | |
parent | 9771c9c77190910309901ceaf3400b3e2c94a536 (diff) | |
download | rockbox-d0e834aa7349fab6367e74d0df88575dfd854496.tar.gz rockbox-d0e834aa7349fab6367e74d0df88575dfd854496.zip |
Okay, this should be the last. I'm sorry for the trouble, but now everything *should* be properly #ifdef'd (which wasn't before) :/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20336 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/iriver/h10/lcd-h10_20gb.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c index 7b42dfe4d9..547999aed3 100644 --- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c +++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c | |||
@@ -187,6 +187,7 @@ void lcd_init_device(void) | |||
187 | lcd_contrast = DEFAULT_CONTRAST_SETTING << 8; | 187 | lcd_contrast = DEFAULT_CONTRAST_SETTING << 8; |
188 | } | 188 | } |
189 | 189 | ||
190 | #ifdef HAVE_LCD_SLEEP | ||
190 | static void lcd_power_on(void) | 191 | static void lcd_power_on(void) |
191 | { | 192 | { |
192 | /* Be sure standby bit is clear. */ | 193 | /* Be sure standby bit is clear. */ |
@@ -274,7 +275,6 @@ static void lcd_power_on(void) | |||
274 | power_on = true; | 275 | power_on = true; |
275 | } | 276 | } |
276 | 277 | ||
277 | #ifdef HAVE_LCD_SLEEP | ||
278 | static void lcd_power_off(void) | 278 | static void lcd_power_off(void) |
279 | { | 279 | { |
280 | /* Display must be off first */ | 280 | /* Display must be off first */ |
@@ -314,7 +314,7 @@ void lcd_sleep(void) | |||
314 | } | 314 | } |
315 | #endif | 315 | #endif |
316 | 316 | ||
317 | 317 | #if defined(HAVE_LCD_ENABLE) | |
318 | static void lcd_display_off(void) | 318 | static void lcd_display_off(void) |
319 | { | 319 | { |
320 | display_on = false; | 320 | display_on = false; |
@@ -337,8 +337,6 @@ static void lcd_display_off(void) | |||
337 | /* PT1-0=00, VLE2-1=00, SPT=0, GON=0, DTE=0, REV=0, D1-0=00 */ | 337 | /* PT1-0=00, VLE2-1=00, SPT=0, GON=0, DTE=0, REV=0, D1-0=00 */ |
338 | lcd_write_reg(R_DISP_CONTROL, 0x0000); | 338 | lcd_write_reg(R_DISP_CONTROL, 0x0000); |
339 | } | 339 | } |
340 | |||
341 | #if defined(HAVE_LCD_ENABLE) | ||
342 | static void lcd_display_on(void) | 340 | static void lcd_display_on(void) |
343 | { | 341 | { |
344 | /* Be sure power is on first */ | 342 | /* Be sure power is on first */ |
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 5b48135ff1..388c02ade4 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | |||
@@ -29,7 +29,9 @@ | |||
29 | #define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)]) | 29 | #define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)]) |
30 | 30 | ||
31 | static bool lcd_on = true; | 31 | static bool lcd_on = true; |
32 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
32 | static bool lcd_powered = true; | 33 | static bool lcd_powered = true; |
34 | #endif | ||
33 | static unsigned lcd_yuv_options = 0; | 35 | static unsigned lcd_yuv_options = 0; |
34 | /* | 36 | /* |
35 | ** This is imported from lcd-16bit.c | 37 | ** This is imported from lcd-16bit.c |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index 5eab75c789..e77c3a2311 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | |||
@@ -191,6 +191,7 @@ static void lcd_display_on(bool reset) | |||
191 | display_on = true; | 191 | display_on = true; |
192 | } | 192 | } |
193 | 193 | ||
194 | #ifdef HAVE_LCD_ENABLE | ||
194 | static void lcd_display_off(void) | 195 | static void lcd_display_off(void) |
195 | { | 196 | { |
196 | /* LQV shutdown sequence */ | 197 | /* LQV shutdown sequence */ |
@@ -225,7 +226,6 @@ static void lcd_display_off(void) | |||
225 | display_on = false; | 226 | display_on = false; |
226 | } | 227 | } |
227 | 228 | ||
228 | #ifdef HAVE_LCD_ENABLE | ||
229 | void lcd_enable(bool on) | 229 | void lcd_enable(bool on) |
230 | { | 230 | { |
231 | /* Disabled until properly working */ | 231 | /* Disabled until properly working */ |