diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-11-21 00:44:44 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-11-21 00:44:44 +0000 |
commit | 61753a893edb980d447d3db80020527d32fb810b (patch) | |
tree | 0b99a598e7fe38a7b44ba1994d13fd72b19a3af8 /apps/screens.c | |
parent | 2996d177360559810ca38c64f733432f236a7611 (diff) | |
download | rockbox-61753a893edb980d447d3db80020527d32fb810b.tar.gz rockbox-61753a893edb980d447d3db80020527d32fb810b.zip |
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/screens.c')
-rw-r--r-- | apps/screens.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/screens.c b/apps/screens.c index d9147f25d9..872aa9a1b0 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -159,6 +159,7 @@ unsigned short adc_read(int channel) | |||
159 | } | 159 | } |
160 | #endif | 160 | #endif |
161 | 161 | ||
162 | #ifdef HAVE_CHARGING | ||
162 | 163 | ||
163 | #ifdef HAVE_LCD_BITMAP | 164 | #ifdef HAVE_LCD_BITMAP |
164 | void charging_display_info(bool animate) | 165 | void charging_display_info(bool animate) |
@@ -204,7 +205,7 @@ void charging_display_info(bool animate) | |||
204 | lcd_puts(0, 3, buf); | 205 | lcd_puts(0, 3, buf); |
205 | if (!charger_enabled) | 206 | if (!charger_enabled) |
206 | animate = false; | 207 | animate = false; |
207 | #endif | 208 | #endif /* HAVE_CHARGE_CTRL */ |
208 | 209 | ||
209 | 210 | ||
210 | /* middle part */ | 211 | /* middle part */ |
@@ -308,9 +309,8 @@ void charging_display_info(bool animate) | |||
308 | for (i = 0; i < 4; i++) | 309 | for (i = 0; i < 4; i++) |
309 | lcd_define_pattern(logo_chars[i], buf + 7 * i); | 310 | lcd_define_pattern(logo_chars[i], buf + 7 * i); |
310 | } | 311 | } |
311 | #endif | 312 | #endif /* (not) HAVE_LCD_BITMAP */ |
312 | 313 | ||
313 | #ifdef HAVE_CHARGING | ||
314 | /* blocks while charging, returns on event: | 314 | /* blocks while charging, returns on event: |
315 | 1 if charger cable was removed | 315 | 1 if charger cable was removed |
316 | 2 if Off/Stop key was pressed | 316 | 2 if Off/Stop key was pressed |