summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-11-21 00:44:44 +0000
committerJens Arnold <amiconn@rockbox.org>2004-11-21 00:44:44 +0000
commit61753a893edb980d447d3db80020527d32fb810b (patch)
tree0b99a598e7fe38a7b44ba1994d13fd72b19a3af8 /apps
parent2996d177360559810ca38c64f733432f236a7611 (diff)
downloadrockbox-61753a893edb980d447d3db80020527d32fb810b.zip
rockbox-61753a893edb980d447d3db80020527d32fb810b.tar.gz
rockbox-61753a893edb980d447d3db80020527d32fb810b.tar.bz2
rockbox-61753a893edb980d447d3db80020527d32fb810b.tar.xz
Fixed a simulator warning, and disabled some unused code for targets without charging (Ondio)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5453 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/screens.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/screens.c b/apps/screens.c
index d9147f2..872aa9a 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -159,6 +159,7 @@ unsigned short adc_read(int channel)
}
#endif
+#ifdef HAVE_CHARGING
#ifdef HAVE_LCD_BITMAP
void charging_display_info(bool animate)
@@ -204,7 +205,7 @@ void charging_display_info(bool animate)
lcd_puts(0, 3, buf);
if (!charger_enabled)
animate = false;
-#endif
+#endif /* HAVE_CHARGE_CTRL */
/* middle part */
@@ -308,9 +309,8 @@ void charging_display_info(bool animate)
for (i = 0; i < 4; i++)
lcd_define_pattern(logo_chars[i], buf + 7 * i);
}
-#endif
+#endif /* (not) HAVE_LCD_BITMAP */
-#ifdef HAVE_CHARGING
/* blocks while charging, returns on event:
1 if charger cable was removed
2 if Off/Stop key was pressed