diff options
8 files changed, 14 insertions, 45 deletions
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index 3b33e1a019..ceeb979573 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h | |||
@@ -65,6 +65,8 @@ void lcd_set_sleep_after_backlight_off(int index); | |||
65 | #endif /* !HAVE_BACKLIGHT */ | 65 | #endif /* !HAVE_BACKLIGHT */ |
66 | 66 | ||
67 | #ifdef HAVE_REMOTE_LCD | 67 | #ifdef HAVE_REMOTE_LCD |
68 | void _remote_backlight_on(void); | ||
69 | void _remote_backlight_off(void); | ||
68 | void remote_backlight_on(void); | 70 | void remote_backlight_on(void); |
69 | void remote_backlight_off(void); | 71 | void remote_backlight_off(void); |
70 | void remote_backlight_set_timeout(int value); | 72 | void remote_backlight_set_timeout(int value); |
diff --git a/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c b/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c index 7dd80946cd..f3891c5000 100644 --- a/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "backlight-target.h" | 24 | #include "backlight-target.h" |
25 | #include "lcd-remote-target.h" | ||
26 | 25 | ||
27 | #define MIN_BRIGHTNESS 0x80ff08ff | 26 | #define MIN_BRIGHTNESS 0x80ff08ff |
28 | 27 | ||
@@ -63,15 +62,3 @@ void _buttonlight_off(void) | |||
63 | /* turn off all touchpad leds */ | 62 | /* turn off all touchpad leds */ |
64 | GPIOA_OUTPUT_VAL &= ~BUTTONLIGHT_ALL; | 63 | GPIOA_OUTPUT_VAL &= ~BUTTONLIGHT_ALL; |
65 | } | 64 | } |
66 | |||
67 | #ifdef HAVE_REMOTE_LCD | ||
68 | void _remote_backlight_on(void) | ||
69 | { | ||
70 | lcd_remote_backlight(true); | ||
71 | } | ||
72 | |||
73 | void _remote_backlight_off(void) | ||
74 | { | ||
75 | lcd_remote_backlight(false); | ||
76 | } | ||
77 | #endif | ||
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c index 1f7ab47a0f..ca4bbde483 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | |||
@@ -486,16 +486,6 @@ void lcd_remote_set_contrast(int val) | |||
486 | rc_status |= RC_UPDATE_CONTROLLER; | 486 | rc_status |= RC_UPDATE_CONTROLLER; |
487 | } | 487 | } |
488 | 488 | ||
489 | void lcd_remote_backlight(bool on) | ||
490 | { | ||
491 | if (on) | ||
492 | rc_status |= RC_BACKLIGHT_ON; | ||
493 | else | ||
494 | rc_status &= ~RC_BACKLIGHT_ON; | ||
495 | |||
496 | rc_status |= RC_UPDATE_CONTROLLER; | ||
497 | } | ||
498 | |||
499 | void lcd_remote_off(void) | 489 | void lcd_remote_off(void) |
500 | { | 490 | { |
501 | /* should only be used to power off at shutdown */ | 491 | /* should only be used to power off at shutdown */ |
@@ -560,3 +550,15 @@ void lcd_remote_update_rect(int x, int y, int width, int height) | |||
560 | 550 | ||
561 | rc_status |= RC_UPDATE_LCD; | 551 | rc_status |= RC_UPDATE_LCD; |
562 | } | 552 | } |
553 | |||
554 | void _remote_backlight_on(void) | ||
555 | { | ||
556 | rc_status |= RC_BACKLIGHT_ON; | ||
557 | rc_status |= RC_UPDATE_CONTROLLER; | ||
558 | } | ||
559 | |||
560 | void _remote_backlight_off(void) | ||
561 | { | ||
562 | rc_status &= ~RC_BACKLIGHT_ON; | ||
563 | rc_status |= RC_UPDATE_CONTROLLER; | ||
564 | } | ||
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h b/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h index a214690aec..ac576c104e 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h +++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h | |||
@@ -21,8 +21,6 @@ | |||
21 | #ifndef LCD_REMOTE_TARGET_H | 21 | #ifndef LCD_REMOTE_TARGET_H |
22 | #define LCD_REMOTE_TARGET_H | 22 | #define LCD_REMOTE_TARGET_H |
23 | 23 | ||
24 | void lcd_remote_backlight(bool on); | ||
25 | |||
26 | bool lcd_remote_read_device(unsigned char *data); | 24 | bool lcd_remote_read_device(unsigned char *data); |
27 | 25 | ||
28 | extern unsigned int rc_status; | 26 | extern unsigned int rc_status; |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h index a3657490eb..2790388833 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h | |||
@@ -21,16 +21,8 @@ | |||
21 | #ifndef LCD_REMOTE_TARGET_H | 21 | #ifndef LCD_REMOTE_TARGET_H |
22 | #define LCD_REMOTE_TARGET_H | 22 | #define LCD_REMOTE_TARGET_H |
23 | 23 | ||
24 | #define REMOTE_INIT_LCD 1 | ||
25 | #define REMOTE_DEINIT_LCD 2 | ||
26 | |||
27 | void lcd_remote_powersave(bool on); | 24 | void lcd_remote_powersave(bool on); |
28 | 25 | ||
29 | #ifndef SIMULATOR | ||
30 | void _remote_backlight_on(void); | ||
31 | void _remote_backlight_off(void); | ||
32 | #endif | ||
33 | |||
34 | void lcd_remote_sleep(void); | 26 | void lcd_remote_sleep(void); |
35 | 27 | ||
36 | int remote_read_device(void); | 28 | int remote_read_device(void); |
diff --git a/firmware/target/coldfire/iaudio/lcd-remote-target.h b/firmware/target/coldfire/iaudio/lcd-remote-target.h index fe55212b81..aaa31116ad 100644 --- a/firmware/target/coldfire/iaudio/lcd-remote-target.h +++ b/firmware/target/coldfire/iaudio/lcd-remote-target.h | |||
@@ -21,9 +21,6 @@ | |||
21 | #ifndef LCD_REMOTE_TARGET_H | 21 | #ifndef LCD_REMOTE_TARGET_H |
22 | #define LCD_REMOTE_TARGET_H | 22 | #define LCD_REMOTE_TARGET_H |
23 | 23 | ||
24 | #define REMOTE_INIT_LCD 1 | ||
25 | #define REMOTE_DEINIT_LCD 2 | ||
26 | |||
27 | void lcd_remote_powersave(bool on); | 24 | void lcd_remote_powersave(bool on); |
28 | void lcd_remote_poweroff(void); /* for when remote is plugged during shutdown*/ | 25 | void lcd_remote_poweroff(void); /* for when remote is plugged during shutdown*/ |
29 | 26 | ||
diff --git a/firmware/target/coldfire/iriver/lcd-remote-target.h b/firmware/target/coldfire/iriver/lcd-remote-target.h index 85bc754143..99bda496e8 100644 --- a/firmware/target/coldfire/iriver/lcd-remote-target.h +++ b/firmware/target/coldfire/iriver/lcd-remote-target.h | |||
@@ -21,9 +21,6 @@ | |||
21 | #ifndef LCD_REMOTE_TARGET_H | 21 | #ifndef LCD_REMOTE_TARGET_H |
22 | #define LCD_REMOTE_TARGET_H | 22 | #define LCD_REMOTE_TARGET_H |
23 | 23 | ||
24 | #define REMOTE_INIT_LCD 1 | ||
25 | #define REMOTE_DEINIT_LCD 2 | ||
26 | |||
27 | #ifdef HAVE_REMOTE_LCD_TICKING | 24 | #ifdef HAVE_REMOTE_LCD_TICKING |
28 | void lcd_remote_emireduce(bool state); | 25 | void lcd_remote_emireduce(bool state); |
29 | #endif | 26 | #endif |
diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h index b5b8ef2a3c..4a97752f75 100644 --- a/uisimulator/common/backlight-sim.h +++ b/uisimulator/common/backlight-sim.h | |||
@@ -39,11 +39,5 @@ void _buttonlight_set_brightness(int val); | |||
39 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ | 39 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ |
40 | #endif /* HAVE_BUTTON_LIGHT */ | 40 | #endif /* HAVE_BUTTON_LIGHT */ |
41 | 41 | ||
42 | #ifdef HAVE_REMOTE_LCD | ||
43 | void _remote_backlight_on(void); | ||
44 | void _remote_backlight_off(void); | ||
45 | #endif /* HAVE_REMOTE_LCD */ | ||
46 | |||
47 | |||
48 | #endif /* BACKLIGHT_SIM_H */ | 42 | #endif /* BACKLIGHT_SIM_H */ |
49 | 43 | ||