Name all button light functions and variables consistently starting with buttonlight_ .

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15016 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 44 insertions, 44 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index a0d08f1..7cbdeb4 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -108,66 +108,66 @@ static int backlight_on_button_hold = 0;
 #endif
 
 #ifdef HAVE_BUTTON_LIGHT
-static int button_backlight_timer;
-static int button_backlight_timeout = 5*HZ;
+static int buttonlight_timer;
+static int buttonlight_timeout = 5*HZ;
 
 /* internal interface */
-static void _button_backlight_on(void)
+static void _buttonlight_on(void)
 {
 #ifndef SIMULATOR
 #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
-    __button_backlight_dim(false);
+    __buttonlight_dim(false);
 #else
-    __button_backlight_on();
+    __buttonlight_on();
 #endif
 #endif
 }
 
-void _button_backlight_off(void)
+void _buttonlight_off(void)
 {
 #ifndef SIMULATOR
 #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
-    if(button_backlight_timeout>0)
-        __button_backlight_dim(true);
+    if(buttonlight_timeout>0)
+        __buttonlight_dim(true);
     else
 #endif
-        __button_backlight_off();
+        __buttonlight_off();
 #endif
 }
 
 /* Update state of buttonlight according to timeout setting */
 static void buttonlight_update_state(void)
 {
-    button_backlight_timer = button_backlight_timeout;
+    buttonlight_timer = buttonlight_timeout;
 
     /* Buttonlight == OFF in the setting? */
-    if (button_backlight_timer < 0)
+    if (buttonlight_timer < 0)
     {
-        button_backlight_timer = 0; /* Disable the timeout */
-        _button_backlight_off();
+        buttonlight_timer = 0; /* Disable the timeout */
+        _buttonlight_off();
     }
     else
-        _button_backlight_on();
+        _buttonlight_on();
 }
 
 /* external interface */
-void button_backlight_on(void)
+void buttonlight_on(void)
 {
     queue_remove_from_head(&backlight_queue, BUTTON_LIGHT_ON);
     queue_post(&backlight_queue, BUTTON_LIGHT_ON, 0);
 }
 
-void button_backlight_off(void)
+void buttonlight_off(void)
 {
     queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0);
 }
 
-void button_backlight_set_timeout(int index)
+void buttonlight_set_timeout(int index)
 {
     if((unsigned)index >= sizeof(backlight_timeout_value))
         /* if given a weird value, use default */
         index = 6;
-    button_backlight_timeout = HZ * backlight_timeout_value[index];
+    buttonlight_timeout = HZ * backlight_timeout_value[index];
     buttonlight_update_state();
 }
 
@@ -543,8 +543,8 @@ void backlight_thread(void)
                 break;
 
             case BUTTON_LIGHT_OFF:
-                button_backlight_timer = 0;
-                _button_backlight_off();
+                buttonlight_timer = 0;
+                _buttonlight_off();
                 break;
 #endif
 
@@ -597,12 +597,12 @@ static void backlight_tick(void)
     }
 #endif /* HAVE_REMOVE_LCD */
 #ifdef HAVE_BUTTON_LIGHT
-    if (button_backlight_timer)
+    if (buttonlight_timer)
     {
-        button_backlight_timer--;
-        if (button_backlight_timer == 0)
+        buttonlight_timer--;
+        if (buttonlight_timer == 0)
         {
-            button_backlight_off();
+            buttonlight_off();
         }
     }
 #endif /* HAVE_BUTTON_LIGHT */
@@ -825,7 +825,7 @@ void backlight_init(void)
 
 void backlight_on(void) {}
 void backlight_off(void) {}
-void button_backlight_on(void) {}
+void buttonlight_on(void) {}
 void backlight_set_timeout(int index) {(void)index;}
 bool is_backlight_on(void) {return true;}
 #ifdef HAVE_REMOTE_LCD
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 7ab78f6..3daa08b 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -259,7 +259,7 @@ static void button_tick(void)
                 {
                     backlight_on();
 #ifdef HAVE_BUTTON_LIGHT
-                    button_backlight_on();
+                    buttonlight_on();
 #endif
                 }
 
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index a0e46d2..8df4599 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -80,9 +80,9 @@ void buttonlight_set_brightness(int val);
 #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
 
 #ifdef HAVE_BUTTON_LIGHT
-void button_backlight_on(void);
-void button_backlight_off(void);
-void button_backlight_set_timeout(int index);
+void buttonlight_on(void);
+void buttonlight_off(void);
+void buttonlight_set_timeout(int index);
 #endif
 
 #endif /* BACKLIGHT_H */
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
index d2beaee..c132be5 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
@@ -328,17 +328,17 @@ static void led_control_service(void)
 }
 #endif /* BOOTLOADER */
 
-void __button_backlight_on(void)
+void __buttonlight_on(void)
 {
     buttonlight_control = BUTTONLIGHT_CONTROL_ON;
 }
 
-void __button_backlight_off(void)
+void __buttonlight_off(void)
 {
     buttonlight_control = BUTTONLIGHT_CONTROL_OFF;
 }
 
-void __button_backlight_dim(bool dim_now)
+void __buttonlight_dim(bool dim_now)
 {
     buttonlight_control = BUTTONLIGHT_CONTROL_IDLE;
     buttonlight_target = (dim_now == true) ? 0 : buttonlight_brightness;
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
index c51d8f2..0589557 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
@@ -48,11 +48,11 @@ void __backlight_set_brightness(int brightness);
 
 void __buttonlight_set_brightness(int brightness);
 
-void __button_backlight_on(void);
-void __button_backlight_off(void);
+void __buttonlight_on(void);
+void __buttonlight_off(void);
 
 /* true: backlight fades off - false: backlight fades on */
 void __backlight_dim(bool dim);
-void __button_backlight_dim(bool dim_now);
+void __buttonlight_dim(bool dim_now);
 
 #endif
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 5655d92..4a818d6 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -82,7 +82,7 @@ int button_read_device(void)
         /* if the buttons dont agree twice in a row, then its none */
         lastbutton = btn;
         btn = BUTTON_NONE;
-        button_backlight_on();
+        buttonlight_on();
     }
 
     /* Check for hold first - exit if asserted with no button pressed */
@@ -107,7 +107,7 @@ int button_read_device(void)
 
         if (buttons & (1 << 4))
             btn |= BUTTON_A;
-        button_backlight_on();
+        buttonlight_on();
     }
     
     /* the touchpad */
@@ -128,7 +128,7 @@ int button_read_device(void)
 
         if (touchpad & (1 << 3))
             btn |= BUTTON_SELECT;
-        button_backlight_on();
+        buttonlight_on();
     }
     
     return btn;
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
index 7921e0c..ac37908 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
@@ -64,7 +64,7 @@ void power_off(void)
 {
     /* turn off backlight and wait for 1 second */
     __backlight_off();
-    __button_backlight_off();
+    __buttonlight_off();
     sleep(HZ);
     /* set SLEEP bit to on in CLKCON to turn off */
     CLKCON |=(1<<3);
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index 0dd4a21..f7835e1 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -51,7 +51,7 @@ void __backlight_off(void)
 }
 
 #ifdef HAVE_BUTTON_LIGHT
-void __button_backlight_on(void)
+void __buttonlight_on(void)
 {
     GPIOG_OUTPUT_VAL |= 0x80;
 #ifdef SANSA_C200
@@ -59,7 +59,7 @@ void __button_backlight_on(void)
 #endif
 }
 
-void __button_backlight_off(void)
+void __buttonlight_off(void)
 {
     GPIOG_OUTPUT_VAL &=~ 0x80;
 #ifdef SANSA_C200
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h
index 1b1a6ad..53a87fb 100644
--- a/firmware/target/arm/sandisk/backlight-target.h
+++ b/firmware/target/arm/sandisk/backlight-target.h
@@ -26,7 +26,7 @@ void __backlight_set_brightness(int brightness);
 int  __backlight_is_on(void);
 
 #ifdef HAVE_BUTTON_LIGHT
-void __button_backlight_on(void);
-void __button_backlight_off(void);
+void __buttonlight_on(void);
+void __buttonlight_off(void);
 #endif
 #endif
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index f6a01c8..5988e16 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -196,7 +196,7 @@ void clickwheel_int(void)
                    than every 1/4 second*/
                 next_backlight_on = current_tick + HZ/4;
                 backlight_on();
-                button_backlight_on();
+                buttonlight_on();
                 reset_poweroff_timer();
             }