diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screens.c | 12 | ||||
-rw-r--r-- | apps/screens.h | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/apps/screens.c b/apps/screens.c index 79bfa423a3..2e9ab22d84 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -173,7 +173,8 @@ int mmc_remove_request(void) | |||
173 | } | 173 | } |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 176 | /* the charging screen is only used for archos targets */ |
177 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) && defined(CPU_SH) | ||
177 | 178 | ||
178 | #ifdef HAVE_LCD_BITMAP | 179 | #ifdef HAVE_LCD_BITMAP |
179 | static void charging_display_info(bool animate) | 180 | static void charging_display_info(bool animate) |
@@ -367,7 +368,7 @@ int charging_screen(void) | |||
367 | action_signalscreenchange(); | 368 | action_signalscreenchange(); |
368 | return rc; | 369 | return rc; |
369 | } | 370 | } |
370 | #endif /* CONFIG_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */ | 371 | #endif /* CONFIG_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING && defined(CPU_SH) */ |
371 | 372 | ||
372 | #ifdef HAVE_PITCHSCREEN | 373 | #ifdef HAVE_PITCHSCREEN |
373 | 374 | ||
@@ -867,7 +868,7 @@ bool set_time_screen(const char* title, struct tm *tm) | |||
867 | unsigned int julianday; | 868 | unsigned int julianday; |
868 | unsigned int realyear; | 869 | unsigned int realyear; |
869 | unsigned int min = 0, steps = 0; | 870 | unsigned int min = 0, steps = 0; |
870 | unsigned int statusbar_height; | 871 | unsigned int statusbar_height = 0; |
871 | unsigned int width, height; | 872 | unsigned int width, height; |
872 | unsigned int separator_width, weekday_width; | 873 | unsigned int separator_width, weekday_width; |
873 | unsigned int line_height, prev_line_height; | 874 | unsigned int line_height, prev_line_height; |
@@ -892,8 +893,6 @@ bool set_time_screen(const char* title, struct tm *tm) | |||
892 | 893 | ||
893 | if(global_settings.statusbar) | 894 | if(global_settings.statusbar) |
894 | statusbar_height = STATUSBAR_HEIGHT; | 895 | statusbar_height = STATUSBAR_HEIGHT; |
895 | else | ||
896 | statusbar_height = 0; | ||
897 | 896 | ||
898 | while ( !done ) { | 897 | while ( !done ) { |
899 | /* calculate the number of days in febuary */ | 898 | /* calculate the number of days in febuary */ |
@@ -1009,9 +1008,8 @@ bool set_time_screen(const char* title, struct tm *tm) | |||
1009 | lcd_puts(0, 4, str(LANG_TIME_SET)); | 1008 | lcd_puts(0, 4, str(LANG_TIME_SET)); |
1010 | lcd_puts(0, 5, str(LANG_TIME_REVERT)); | 1009 | lcd_puts(0, 5, str(LANG_TIME_REVERT)); |
1011 | 1010 | ||
1012 | #ifdef HAVE_LCD_BITMAP | ||
1013 | gui_syncstatusbar_draw(&statusbars, true); | 1011 | gui_syncstatusbar_draw(&statusbars, true); |
1014 | #endif | 1012 | |
1015 | lcd_update(); | 1013 | lcd_update(); |
1016 | 1014 | ||
1017 | /* calculate the minimum and maximum for the number under cursor */ | 1015 | /* calculate the minimum and maximum for the number under cursor */ |
diff --git a/apps/screens.h b/apps/screens.h index 6b576f164f..4d7704f7d5 100644 --- a/apps/screens.h +++ b/apps/screens.h | |||
@@ -24,10 +24,13 @@ | |||
24 | 24 | ||
25 | struct screen; | 25 | struct screen; |
26 | 26 | ||
27 | void usb_display_info(struct screen * display); | ||
28 | void usb_screen(void); | 27 | void usb_screen(void); |
28 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) && defined(CPU_SH) | ||
29 | int charging_screen(void); | 29 | int charging_screen(void); |
30 | #endif | ||
31 | #if CONFIG_CHARGING || defined(SIMULATOR) | ||
30 | void charging_splash(void); | 32 | void charging_splash(void); |
33 | #endif | ||
31 | 34 | ||
32 | #ifdef HAVE_MMC | 35 | #ifdef HAVE_MMC |
33 | int mmc_remove_request(void); | 36 | int mmc_remove_request(void); |