summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2012-01-07 18:34:09 +0000
committerRafaël Carré <rafael.carre@gmail.com>2012-01-07 18:34:09 +0000
commit666f2e61f0737062b0ce14618f5b7c704273a236 (patch)
tree9142bf12e79ee11be2fa35a8aa5659db9fe906af
parent2a5772a20cc54c36f3fe6214522b332ef3643a88 (diff)
downloadrockbox-666f2e61f0737062b0ce14618f5b7c704273a236.tar.gz
rockbox-666f2e61f0737062b0ce14618f5b7c704273a236.zip
move lcd remote common declarations to lcd-remote.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31604 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/lcd-remote.h5
-rw-r--r--firmware/target/arm/olympus/mrobe-100/button-mr100.c2
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h4
-rw-r--r--firmware/target/arm/olympus/mrobe-100/power-mr100.c2
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h5
-rw-r--r--firmware/target/coldfire/iaudio/lcd-remote-target.h5
-rw-r--r--firmware/target/coldfire/iriver/lcd-remote-target.h5
7 files changed, 7 insertions, 21 deletions
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 305392cd90..f2fbbc62f3 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -112,6 +112,11 @@ extern unsigned lcd_remote_color_to_native(unsigned color);
112/* The actual framebuffer */ 112/* The actual framebuffer */
113extern fb_remote_data lcd_remote_framebuffer[LCD_REMOTE_FBHEIGHT][LCD_REMOTE_FBWIDTH]; 113extern fb_remote_data lcd_remote_framebuffer[LCD_REMOTE_FBHEIGHT][LCD_REMOTE_FBWIDTH];
114 114
115void lcd_remote_init_device(void);
116void lcd_remote_on(void);
117void lcd_remote_off(void);
118
119extern bool remote_initialized;
115 120
116extern void lcd_remote_init(void); 121extern void lcd_remote_init(void);
117extern int lcd_remote_default_contrast(void); 122extern int lcd_remote_default_contrast(void);
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
index 4a17f4d07e..563498b3f4 100644
--- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
@@ -26,7 +26,7 @@
26#include "synaptics-mep.h" 26#include "synaptics-mep.h"
27 27
28#ifdef HAVE_REMOTE_LCD 28#ifdef HAVE_REMOTE_LCD
29#include "lcd-remote-target.h" 29#include "lcd-remote.h"
30static bool remote_hold = false; 30static bool remote_hold = false;
31static bool headphones_status = true; 31static bool headphones_status = true;
32#endif 32#endif
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 051ba08294..6226f4462e 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h
@@ -25,12 +25,8 @@ bool remote_detect(void); /* returns detection status */
25 25
26void lcd_remote_backlight(bool on); 26void lcd_remote_backlight(bool on);
27 27
28void lcd_remote_init_device(void);
29void lcd_remote_on(void);
30void lcd_remote_off(void);
31bool lcd_remote_read_device(unsigned char *data); 28bool lcd_remote_read_device(unsigned char *data);
32 29
33extern bool remote_initialized;
34extern unsigned int rc_status; 30extern unsigned int rc_status;
35extern unsigned char rc_buf[5]; 31extern unsigned char rc_buf[5];
36#endif 32#endif
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
index 6f6ee2bc2c..4b0adb4031 100644
--- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
@@ -27,7 +27,7 @@
27#include "power.h" 27#include "power.h"
28#include "logf.h" 28#include "logf.h"
29#include "usb.h" 29#include "usb.h"
30#include "lcd-remote-target.h" 30#include "lcd-remote.h"
31 31
32void power_init(void) 32void power_init(void)
33{ 33{
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 1d409231b8..ee3443b666 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h
@@ -27,17 +27,12 @@
27void lcd_remote_powersave(bool on); 27void lcd_remote_powersave(bool on);
28 28
29bool remote_detect(void); 29bool remote_detect(void);
30void lcd_remote_init_device(void);
31void lcd_remote_on(void);
32void lcd_remote_off(void);
33 30
34#ifndef SIMULATOR 31#ifndef SIMULATOR
35void _remote_backlight_on(void); 32void _remote_backlight_on(void);
36void _remote_backlight_off(void); 33void _remote_backlight_off(void);
37#endif 34#endif
38 35
39extern bool remote_initialized;
40
41void lcd_remote_sleep(void); 36void lcd_remote_sleep(void);
42 37
43int remote_read_device(void); 38int 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 b8c38e4d93..435eee08c8 100644
--- a/firmware/target/coldfire/iaudio/lcd-remote-target.h
+++ b/firmware/target/coldfire/iaudio/lcd-remote-target.h
@@ -24,13 +24,8 @@
24#define REMOTE_INIT_LCD 1 24#define REMOTE_INIT_LCD 1
25#define REMOTE_DEINIT_LCD 2 25#define REMOTE_DEINIT_LCD 2
26 26
27void lcd_remote_init_device(void);
28bool remote_detect(void); 27bool remote_detect(void);
29void lcd_remote_powersave(bool on); 28void lcd_remote_powersave(bool on);
30void lcd_remote_on(void);
31void lcd_remote_off(void);
32void lcd_remote_poweroff(void); /* for when remote is plugged during shutdown*/ 29void lcd_remote_poweroff(void); /* for when remote is plugged during shutdown*/
33 30
34extern bool remote_initialized;
35
36#endif 31#endif
diff --git a/firmware/target/coldfire/iriver/lcd-remote-target.h b/firmware/target/coldfire/iriver/lcd-remote-target.h
index 4829d3da10..7e2b6f5940 100644
--- a/firmware/target/coldfire/iriver/lcd-remote-target.h
+++ b/firmware/target/coldfire/iriver/lcd-remote-target.h
@@ -30,10 +30,5 @@ void lcd_remote_emireduce(bool state);
30void lcd_remote_powersave(bool on); 30void lcd_remote_powersave(bool on);
31 31
32bool remote_detect(void); 32bool remote_detect(void);
33void lcd_remote_init_device(void);
34void lcd_remote_on(void);
35void lcd_remote_off(void);
36
37extern bool remote_initialized;
38 33
39#endif 34#endif