4 files changed, 13 insertions, 18 deletions

diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c
index 1f582ec8df..80e340c0d5 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-h100.c
+++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c
@@ -35,12 +35,12 @@ bool backlight_hw_init(void)
     return (GPIO1_OUT & 0x00020000) ? false : true;
 }
 
-void _backlight_hw_on(void)
+void backlight_hw_on(void)
 {
     and_l(~0x00020000, &GPIO1_OUT);
 }
 
-void _backlight_hw_off(void)
+void backlight_hw_off(void)
 {
     or_l(0x00020000, &GPIO1_OUT);
 }
diff --git a/firmware/target/coldfire/iriver/h100/backlight-target.h b/firmware/target/coldfire/iriver/h100/backlight-target.h
index 64d0353ab0..b6cc4a2000 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-target.h
+++ b/firmware/target/coldfire/iriver/h100/backlight-target.h
@@ -26,10 +26,10 @@ void backlight_hw_on(void);
 void backlight_hw_off(void);
 
 #ifndef BOOTLOADER
-#define backlight_hw_on_isr() backlight_hw_on()
-#define backlight_hw_off_isr() backlight_hw_off()
-#define backlight_hw_on_normal() backlight_hw_on()
-#define backlight_hw_off_normal() backlight_hw_off()
+#define _backlight_on_isr() backlight_hw_on()
+#define _backlight_off_isr() backlight_hw_off()
+#define _backlight_on_normal() backlight_hw_on()
+#define _backlight_off_normal() backlight_hw_off()
 #define _BACKLIGHT_FADE_BOOST
 #endif
 
diff --git a/firmware/target/coldfire/mpio/backlight-mpio.c b/firmware/target/coldfire/mpio/backlight-mpio.c
index e04fa6d7dc..9d8186beed 100644
--- a/firmware/target/coldfire/mpio/backlight-mpio.c
+++ b/firmware/target/coldfire/mpio/backlight-mpio.c
@@ -27,7 +27,7 @@
 #include "backlight-target.h"
 #include "lcd.h"
 
-static bool backlight_hw_on = true;
+static bool _backlight_on = true;
 static int _brightness = DEFAULT_BRIGHTNESS_SETTING;
 
 /* Returns the current state of the backlight (true=ON, false=OFF). */
@@ -41,23 +41,23 @@ bool backlight_hw_init(void)
     return true;
 }
 
-void _backlight_hw_on(void)
+void backlight_hw_on(void)
 {
 #ifndef BOOTLOADER
-    if (backlight_hw_on)
+    if (_backlight_on)
         return;
 #endif
    
     backlight_hw_brightness(_brightness);
-    backlight_hw_on = true;
+    _backlight_on = true;
 
 }
 
-void _backlight_hw_off(void)
+void backlight_hw_off(void)
 {
     /* GPIO28 low */
     and_l(~(1<<28),&GPIO_OUT);
-    backlight_hw_on = false;
+    _backlight_on = false;
 }
 
 void backlight_hw_brightness(int val)
@@ -65,7 +65,7 @@ void backlight_hw_brightness(int val)
     unsigned char i;
 
 #ifndef BOOTLOADER
-    if( _brightness == val && backlight_hw_on == true )
+    if( _brightness == val && _backlight_on == true )
         return;
 #endif
 
diff --git a/firmware/target/coldfire/mpio/backlight-target.h b/firmware/target/coldfire/mpio/backlight-target.h
index b73bf27c89..12a3e7a225 100644
--- a/firmware/target/coldfire/mpio/backlight-target.h
+++ b/firmware/target/coldfire/mpio/backlight-target.h
@@ -25,9 +25,4 @@ bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */
 void backlight_hw_on(void);
 void backlight_hw_off(void);
 void backlight_hw_brightness(int val);
-
-#define backlight_hw_on_isr() backlight_hw_on()
-#define backlight_hw_off_isr() backlight_hw_off()
-#define backlight_hw_on_normal() backlight_hw_on()
-#define backlight_hw_off_normal() backlight_hw_off()
 #endif