Merged Magnus Holmgren's wps.config code.

Moved wps.config from root to /.rockbox dir.
Removed WPS display setting.


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

1 files changed, 1 insertions, 13 deletions

diff --git a/apps/status.c b/apps/status.c
index 47d01e30dd..fe4762e3ea 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -36,7 +36,6 @@
 static enum playmode current_mode = STATUS_STOP;
 
 #ifdef HAVE_LCD_BITMAP
-bool statusbar_enabled = true;
 long switch_tick;
 bool plug_state;
 bool battery_state;
@@ -54,17 +53,6 @@ void status_set_playmode(enum playmode mode)
     status_draw();
 }
 
-#ifdef HAVE_LCD_BITMAP
-bool statusbar(bool state)
-{
-    bool laststate = statusbar_enabled;
-
-    statusbar_enabled = state;
-
-    return(laststate);
-}
-#endif
-
 void status_draw(void)
 {
     int battlevel = battery_level();
@@ -133,7 +121,7 @@ void status_draw(void)
     }
 #endif
 #ifdef HAVE_LCD_BITMAP
-    if(global_settings.statusbar && statusbar_enabled) {
+    if (global_settings.statusbar) {
         statusbar_wipe();
 #ifdef HAVE_CHARGE_CTRL
         if(charger_inserted()) {