From dc33e1e8a7557c82a943e4b096116775358449ca Mon Sep 17 00:00:00 2001 From: Peter D'Hoye Date: Fri, 30 Mar 2007 23:36:10 +0000 Subject: Don't check for bootfile changes on devices that use OF for USB (and thus reboot) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12974 a1c6a512-1295-4272-9138-f99709370657 --- apps/misc.c | 8 ++++++++ apps/misc.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/apps/misc.c b/apps/misc.c index fb83bde..0a31339 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -62,10 +62,12 @@ #include "misc.h" #ifdef BOOTFILE +#ifndef USB_IPODSTYLE #include "textarea.h" #include "rolo.h" #include "yesno.h" #endif +#endif /* Format a large-range value for output, using the appropriate unit so that * the displayed value is in the range 1 <= display < 1000 (1024 for "binary" @@ -773,12 +775,16 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame scrobbler_flush_cache(); system_flush(); #ifdef BOOTFILE +#ifndef USB_IPODSTYLE check_bootfile(false); /* gets initial size */ #endif +#endif usb_screen(); #ifdef BOOTFILE +#ifndef USB_IPODSTYLE check_bootfile(true); #endif +#endif system_restore(); } return SYS_USB_CONNECTED; @@ -871,6 +877,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain) #endif #ifdef BOOTFILE +#ifndef USB_IPODSTYLE /* memorize/compare details about the BOOTFILE we don't use dircache because it may not be up to date after @@ -914,3 +921,4 @@ void check_bootfile(bool do_rolo) closedir(dir); } #endif +#endif diff --git a/apps/misc.h b/apps/misc.h index 20cb84b..b30942f 100644 --- a/apps/misc.h +++ b/apps/misc.h @@ -100,7 +100,9 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain); #endif #ifdef BOOTFILE +#ifndef USB_IPODSTYLE void check_bootfile(bool do_rolo); #endif +#endif #endif /* MISC_H */ -- cgit v1.1