From 666f2e61f0737062b0ce14618f5b7c704273a236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@gmail.com>
Date: Sat, 7 Jan 2012 18:34:09 +0000
Subject: [PATCH] move lcd remote common declarations to lcd-remote.h

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31604 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/export/lcd-remote.h                                 | 5 +++++
 firmware/target/arm/olympus/mrobe-100/button-mr100.c         | 2 +-
 firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h    | 4 ----
 firmware/target/arm/olympus/mrobe-100/power-mr100.c          | 2 +-
 .../target/arm/tms320dm320/mrobe-500/lcd-remote-target.h     | 5 -----
 firmware/target/coldfire/iaudio/lcd-remote-target.h          | 5 -----
 firmware/target/coldfire/iriver/lcd-remote-target.h          | 5 -----
 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);
 /* The actual framebuffer */
 extern fb_remote_data lcd_remote_framebuffer[LCD_REMOTE_FBHEIGHT][LCD_REMOTE_FBWIDTH];
 
+void lcd_remote_init_device(void);
+void lcd_remote_on(void);
+void lcd_remote_off(void);
+
+extern bool remote_initialized;
 
 extern void lcd_remote_init(void);
 extern 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 @@
 #include "synaptics-mep.h"
 
 #ifdef HAVE_REMOTE_LCD
-#include "lcd-remote-target.h"
+#include "lcd-remote.h"
 static bool remote_hold = false;
 static bool headphones_status = true;
 #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 */
 
 void lcd_remote_backlight(bool on);
 
-void lcd_remote_init_device(void);
-void lcd_remote_on(void);
-void lcd_remote_off(void);
 bool lcd_remote_read_device(unsigned char *data);
 
-extern bool remote_initialized;
 extern unsigned int rc_status;
 extern unsigned char rc_buf[5];
 #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 @@
 #include "power.h"
 #include "logf.h"
 #include "usb.h"
-#include "lcd-remote-target.h"
+#include "lcd-remote.h"
 
 void power_init(void)
 {
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 @@
 void lcd_remote_powersave(bool on);
 
 bool remote_detect(void);
-void lcd_remote_init_device(void);
-void lcd_remote_on(void);
-void lcd_remote_off(void);
 
 #ifndef SIMULATOR
 void _remote_backlight_on(void);
 void _remote_backlight_off(void);
 #endif
 
-extern bool remote_initialized;
-
 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 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 @@
 #define REMOTE_INIT_LCD   1
 #define REMOTE_DEINIT_LCD 2
 
-void lcd_remote_init_device(void);
 bool remote_detect(void);
 void lcd_remote_powersave(bool on);
-void lcd_remote_on(void);
-void lcd_remote_off(void);
 void lcd_remote_poweroff(void); /* for when remote is plugged during shutdown*/
 
-extern bool remote_initialized;
-
 #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);
 void lcd_remote_powersave(bool on);
 
 bool remote_detect(void);
-void lcd_remote_init_device(void);
-void lcd_remote_on(void);
-void lcd_remote_off(void);
-
-extern bool remote_initialized;
 
 #endif