summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2012-01-07 19:32:50 +0000
committerRafaël Carré <rafael.carre@gmail.com>2012-01-07 19:32:50 +0000
commit351c8b257381cefc14b86b4d5de9eb93390f4de4 (patch)
treea0f4eeaffdf3acac3c3a3731d3fb287aabdd8fa9
parent6ab12df1534999b6f4de723335e4fbb42c55be2c (diff)
move _remote_backlight_* to common header
remove unused REMOTE_INIT_LCD / REMOTE_DEINIT_LCD git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31607 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/backlight.h2
-rw-r--r--firmware/target/arm/olympus/mrobe-100/backlight-mr100.c13
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c22
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h2
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h8
-rw-r--r--firmware/target/coldfire/iaudio/lcd-remote-target.h3
-rw-r--r--firmware/target/coldfire/iriver/lcd-remote-target.h3
-rw-r--r--uisimulator/common/backlight-sim.h6
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);
#endif /* !HAVE_BACKLIGHT */
#ifdef HAVE_REMOTE_LCD
+void _remote_backlight_on(void);
+void _remote_backlight_off(void);
void remote_backlight_on(void);
void remote_backlight_off(void);
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 @@
#include "config.h"
#include "system.h"
#include "backlight-target.h"
-#include "lcd-remote-target.h"
#define MIN_BRIGHTNESS 0x80ff08ff
@@ -63,15 +62,3 @@ void _buttonlight_off(void)
/* turn off all touchpad leds */
GPIOA_OUTPUT_VAL &= ~BUTTONLIGHT_ALL;
}
-
-#ifdef HAVE_REMOTE_LCD
-void _remote_backlight_on(void)
-{
- lcd_remote_backlight(true);
-}
-
-void _remote_backlight_off(void)
-{
- lcd_remote_backlight(false);
-}
-#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)
rc_status |= RC_UPDATE_CONTROLLER;
}
-void lcd_remote_backlight(bool on)
-{
- if (on)
- rc_status |= RC_BACKLIGHT_ON;
- else
- rc_status &= ~RC_BACKLIGHT_ON;
-
- rc_status |= RC_UPDATE_CONTROLLER;
-}
-
void lcd_remote_off(void)
{
/* 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)
rc_status |= RC_UPDATE_LCD;
}
+
+void _remote_backlight_on(void)
+{
+ rc_status |= RC_BACKLIGHT_ON;
+ rc_status |= RC_UPDATE_CONTROLLER;
+}
+
+void _remote_backlight_off(void)
+{
+ rc_status &= ~RC_BACKLIGHT_ON;
+ rc_status |= RC_UPDATE_CONTROLLER;
+}
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 @@
#ifndef LCD_REMOTE_TARGET_H
#define LCD_REMOTE_TARGET_H
-void lcd_remote_backlight(bool on);
-
bool lcd_remote_read_device(unsigned char *data);
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 @@
#ifndef LCD_REMOTE_TARGET_H
#define LCD_REMOTE_TARGET_H
-#define REMOTE_INIT_LCD 1
-#define REMOTE_DEINIT_LCD 2
-
void lcd_remote_powersave(bool on);
-#ifndef SIMULATOR
-void _remote_backlight_on(void);
-void _remote_backlight_off(void);
-#endif
-
void lcd_remote_sleep(void);
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 @@
#ifndef LCD_REMOTE_TARGET_H
#define LCD_REMOTE_TARGET_H
-#define REMOTE_INIT_LCD 1
-#define REMOTE_DEINIT_LCD 2
-
void lcd_remote_powersave(bool on);
void lcd_remote_poweroff(void); /* for when remote is plugged during shutdown*/
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 @@
#ifndef LCD_REMOTE_TARGET_H
#define LCD_REMOTE_TARGET_H
-#define REMOTE_INIT_LCD 1
-#define REMOTE_DEINIT_LCD 2
-
#ifdef HAVE_REMOTE_LCD_TICKING
void lcd_remote_emireduce(bool state);
#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);
#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
#endif /* HAVE_BUTTON_LIGHT */
-#ifdef HAVE_REMOTE_LCD
-void _remote_backlight_on(void);
-void _remote_backlight_off(void);
-#endif /* HAVE_REMOTE_LCD */
-
-
#endif /* BACKLIGHT_SIM_H */