nihilazo/rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ifdef out charging screen for targets that do not use it, + minor cleaning

Browse Source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13820 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2007-07-08 15:32:56 +00:00
parent 979c2b7c66
commit 3f8c075f24
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/screens.c
View File

@ -173,7 +173,8 @@ int mmc_remove_request(void)
}
#endif
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
/* the charging screen is only used for archos targets */
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) && defined(CPU_SH)
#ifdef HAVE_LCD_BITMAP
static void charging_display_info(bool animate)
@ -367,7 +368,7 @@ int charging_screen(void)
action_signalscreenchange();
return rc;
}
#endif /* CONFIG_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */
#endif /* CONFIG_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING && defined(CPU_SH) */
#ifdef HAVE_PITCHSCREEN
@ -867,7 +868,7 @@ bool set_time_screen(const char* title, struct tm *tm)
unsigned int julianday;
unsigned int realyear;
unsigned int min = 0, steps = 0;
unsigned int statusbar_height;
unsigned int statusbar_height = 0;
unsigned int width, height;
unsigned int separator_width, weekday_width;
unsigned int line_height, prev_line_height;
@ -892,8 +893,6 @@ bool set_time_screen(const char* title, struct tm *tm)
if(global_settings.statusbar)
statusbar_height = STATUSBAR_HEIGHT;
else
statusbar_height = 0;
while ( !done ) {
/* calculate the number of days in febuary */
@ -1009,9 +1008,8 @@ bool set_time_screen(const char* title, struct tm *tm)
lcd_puts(0, 4, str(LANG_TIME_SET));
lcd_puts(0, 5, str(LANG_TIME_REVERT));
#ifdef HAVE_LCD_BITMAP
gui_syncstatusbar_draw(&statusbars, true);
#endif
lcd_update();
/* calculate the minimum and maximum for the number under cursor */

5
apps/screens.h
View File

@ -24,10 +24,13 @@
struct screen;
void usb_display_info(struct screen * display);
void usb_screen(void);
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) && defined(CPU_SH)
int charging_screen(void);
#endif
#if CONFIG_CHARGING || defined(SIMULATOR)
void charging_splash(void);
#endif
#ifdef HAVE_MMC
int mmc_remove_request(void);