summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-10-28 00:52:19 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-10-28 00:52:19 +0000
commit7d6b987892b4f006113d390da0c7f2487de72c96 (patch)
tree8788a9f206b2bf271e7c25f9ffb4a86df8520902 /apps
parent530ff7de690a3df77e69008609ae308448f43a81 (diff)
downloadrockbox-7d6b987892b4f006113d390da0c7f2487de72c96.tar.gz
rockbox-7d6b987892b4f006113d390da0c7f2487de72c96.tar.bz2
rockbox-7d6b987892b4f006113d390da0c7f2487de72c96.zip
Fixed Ondio and V2/FM compiling problems from the multiscreen patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7669 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/statusbar.c11
-rw-r--r--apps/gui/statusbar.h3
2 files changed, 10 insertions, 4 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 5ddc194610..52b93a4385 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -30,6 +30,8 @@
#include "icons.h"
#include "powermgmt.h"
#include "button.h"
+#include "usb.h"
+#include "led.h"
#include "status.h" /* needed for battery_state global var */
#include "wps.h" /* for keys_locked */
@@ -88,7 +90,7 @@ void gui_statusbar_init(struct gui_statusbar * bar)
{
bar->last_volume = -1; /* -1 means "first update ever" */
bar->battery_icon_switch_tick = 0;
-#ifdef HAVE_USB_POWER
+#ifdef HAVE_CHARGING
bar->battery_charge_step = 0;
#endif
}
@@ -446,9 +448,10 @@ void gui_statusbar_icon_lock(struct screen * display)
*/
void gui_statusbar_led(struct screen * display)
{
- display->mono_bitmap(bitmap_icon_disk, STATUSBAR_DISK_X_POS,
- STATUSBAR_Y_POS, STATUSBAR_DISK_WIDTH(screen->width),
- STATUSBAR_HEIGHT);
+ display->mono_bitmap(bitmap_icon_disk,
+ STATUSBAR_DISK_X_POS(display->width),
+ STATUSBAR_Y_POS, STATUSBAR_DISK_WIDTH,
+ STATUSBAR_HEIGHT);
}
#endif
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 434d679e29..483652d67d 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -41,6 +41,9 @@ struct status_info {
#ifdef HAVE_USB_POWER
bool usb_power;
#endif
+#ifdef HAVE_CHARGING
+ int battery_charge_step;
+#endif
};
struct gui_statusbar