Get rid of stupid _backlight_* function names

_remote_backlight_* and _buttonlight_* are cleaned as well

Change-Id: I73653752831bbe170c26ba95d3bc04c2e3a5cf30

3 files changed, 21 insertions, 23 deletions

diff --git a/firmware/target/coldfire/mpio/backlight-mpio.c b/firmware/target/coldfire/mpio/backlight-mpio.c
index 1e40e9bb88..e04fa6d7dc 100644
--- a/firmware/target/coldfire/mpio/backlight-mpio.c
+++ b/firmware/target/coldfire/mpio/backlight-mpio.c
@@ -27,11 +27,11 @@
 #include "backlight-target.h"
 #include "lcd.h"
 
-static bool _backlight_on = true;
+static bool backlight_hw_on = true;
 static int _brightness = DEFAULT_BRIGHTNESS_SETTING;
 
 /* Returns the current state of the backlight (true=ON, false=OFF). */
-bool _backlight_init(void)
+bool backlight_hw_init(void)
 {
 #ifdef BOOTLOADER
     and_l(~(1<<28),&GPIO_OUT);
@@ -44,12 +44,12 @@ bool _backlight_init(void)
 void _backlight_hw_on(void)
 {
 #ifndef BOOTLOADER
-    if (_backlight_on)
+    if (backlight_hw_on)
         return;
 #endif
    
-    _backlight_set_brightness(_brightness);
-    _backlight_on = true;
+    backlight_hw_brightness(_brightness);
+    backlight_hw_on = true;
 
 }
 
@@ -57,15 +57,15 @@ void _backlight_hw_off(void)
 {
     /* GPIO28 low */
     and_l(~(1<<28),&GPIO_OUT);
-    _backlight_on = false;
+    backlight_hw_on = false;
 }
 
-void _backlight_set_brightness(int val)
+void backlight_hw_brightness(int val)
 {
     unsigned char i;
 
 #ifndef BOOTLOADER
-    if( _brightness == val && _backlight_on == true )
+    if( _brightness == val && backlight_hw_on == true )
         return;
 #endif
 
@@ -83,12 +83,12 @@ void _backlight_set_brightness(int val)
     _brightness = val;
 }
 
-void _remote_backlight_on(void)
+void remote_backlight_hw_on(void)
 {
     /* I don't have remote to play with */
 }
 
-void _remote_backlight_off(void)
+void remote_backlight_hw_off(void)
 {
     /* I don't have remote to play with */
 }
diff --git a/firmware/target/coldfire/mpio/backlight-target.h b/firmware/target/coldfire/mpio/backlight-target.h
index 93b1f309fb..b73bf27c89 100644
--- a/firmware/target/coldfire/mpio/backlight-target.h
+++ b/firmware/target/coldfire/mpio/backlight-target.h
@@ -21,15 +21,13 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
-bool _backlight_init(void); /* Returns backlight current state (true=ON). */
-void _backlight_hw_on(void);
-void _backlight_hw_off(void);
-void _backlight_set_brightness(int val);
+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_on() _backlight_hw_on()
-#define _backlight_off() _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_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
diff --git a/firmware/target/coldfire/mpio/hd300/button-hd300.c b/firmware/target/coldfire/mpio/hd300/button-hd300.c
index fda26dd0df..e84b8d442b 100644
--- a/firmware/target/coldfire/mpio/hd300/button-hd300.c
+++ b/firmware/target/coldfire/mpio/hd300/button-hd300.c
@@ -80,7 +80,7 @@ void scrollstrip_isr(void)
     static signed char prev_scroll_lines = -1;
     static signed char direction = 0;
     static unsigned char count = 0;
-    static long next_backlight_on = 0;
+    static long nextbacklight_hw_on = 0;
 
     signed int new_scroll_lines;
     signed int scroll_dir;
@@ -120,11 +120,11 @@ void scrollstrip_isr(void)
     }
 
     /* poke backlight */
-    if (TIME_AFTER(current_tick, next_backlight_on))
+    if (TIME_AFTER(current_tick, nextbacklight_hw_on))
     {
         backlight_on();
         reset_poweroff_timer();
-        next_backlight_on = current_tick + HZ/4;
+        nextbacklight_hw_on = current_tick + HZ/4;
     }
 
     /* apply sensitivity filter */