11 files changed, 40 insertions, 34 deletions

diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index 6fee2c0db5..6d3d4d5451 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -21,24 +21,32 @@
 
 #include "config.h"
 
-void backlight_init(void);
 void backlight_on(void);
 void backlight_off(void);
-void backlight_tick(void);
-int  backlight_get_timeout(void);
 void backlight_set_timeout(int index);
+#ifdef CONFIG_BACKLIGHT
+void backlight_init(void);
+int  backlight_get_timeout(void);
 #if CONFIG_BACKLIGHT == BL_IRIVER_H100
 void backlight_set_fade_in(int index);
 void backlight_set_fade_out(int index);
 #endif
 bool backlight_get_on_when_charging(void);
 void backlight_set_on_when_charging(bool yesno);
-void remote_backlight_on(void);
-void remote_backlight_off(void);
 extern const char backlight_timeout_value[];
+#else
+#define backlight_init()
+#endif
 
 #ifdef HAVE_REMOTE_LCD
+void remote_backlight_on(void);
+void remote_backlight_off(void);
 void remote_backlight_set_timeout(int index);
+void remote_backlight_set_on_when_charging(bool yesno);
 #endif
 
+#ifdef SIMULATOR
+void sim_backlight(int value);
+void sim_remote_backlight(int value);
+#endif
 #endif
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index ac6f37c8c9..28d8239c22 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -32,6 +32,9 @@
 /* Define this for S/PDIF input available */
 #define HAVE_SPDIF_IN
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
+
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
@@ -83,9 +86,6 @@
 /* Software controlled LED */
 #define CONFIG_LED LED_REAL
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
-
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index ef13380538..1327be7e27 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -38,6 +38,9 @@
 
 #define CONFIG_LCD LCD_S1D15E06
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
@@ -77,9 +80,6 @@
 /* The size of the flash ROM */
 #define FLASH_SIZE 0x200000
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      11289600
 
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index d67973c0b3..fd001a470e 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -31,6 +31,9 @@
 
 #define CONFIG_LCD LCD_S1D15E06
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
@@ -72,9 +75,6 @@
 /* The size of the flash ROM */
 #define FLASH_SIZE 0x200000
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      11289600
 
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 256cdeac77..5524a55dc0 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -36,6 +36,9 @@
 /* Define this if you have an remote lcd */
 #define HAVE_REMOTE_LCD
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IRIVER_H300 /* port controlled PWM */
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
@@ -69,9 +72,6 @@
 /* The size of the flash ROM */
 #define FLASH_SIZE 0x400000
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_IRIVER_H300 /* port controlled PWM */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      11289600
 
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 0e1637d765..c1068b06eb 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -38,6 +38,9 @@
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8975
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */
+
 #ifndef SIMULATOR
 
 /* Define this if you have a PortalPlayer PP5020 */
@@ -60,9 +63,6 @@
 /* The start address index for ROM builds */
 #define ROM_START 0x00000000
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      11289600
 
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 3423079be0..99eb67b5bf 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -38,6 +38,9 @@
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8975
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IPODNANO /* port controlled */
+
 #ifndef SIMULATOR
 
 /* The Nano actually has a PP5021 - but it's register compatible with 
@@ -62,9 +65,6 @@
 /* The start address index for ROM builds */
 #define ROM_START 0x00000000
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_IPODNANO /* port controlled */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      11289600
 
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index e12e2234e1..f3b1bbddd7 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -20,6 +20,9 @@
 /* Define this if you have a DAC3550A */
 #define HAVE_DAC3550A
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_PA14_LO /* port PA14, low active */
+
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
@@ -70,9 +73,6 @@
 /* Software controlled LED */
 #define CONFIG_LED LED_REAL
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_PA14_LO /* port PA14, low active */
-
 #define CONFIG_LCD LCD_SSD1801
 
 #define BOOTFILE_EXT "mod"
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index c674b63996..32c29b2ec5 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -26,6 +26,9 @@
 /* Define this for S/PDIF input available */
 #define HAVE_SPDIF_IN
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
+
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
@@ -74,9 +77,6 @@
 /* Software controlled LED */
 #define CONFIG_LED LED_REAL
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
-
 /* Define this for S/PDIF output available */
 #define HAVE_SPDIF_OUT
 
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 1de321799e..fbe99812dc 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -29,6 +29,9 @@
 /* Define this for S/PDIF input available */
 #define HAVE_SPDIF_IN
 
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
+
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
@@ -83,9 +86,6 @@
 /* Software controlled LED */
 #define CONFIG_LED LED_REAL
 
-/* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
-
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 6d5091fc66..491e055b17 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -30,8 +30,6 @@
 #define STYLE_INVERT  1
 
 extern void lcd_remote_init(void);
-extern void lcd_remote_backlight_on(void);
-extern void lcd_remote_backlight_off(void);
 extern int  lcd_remote_default_contrast(void);
 extern void lcd_remote_set_contrast(int val);
 extern void lcd_remote_emireduce(bool state);