summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2007-03-30 23:36:10 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2007-03-30 23:36:10 +0000
commitdc33e1e8a7557c82a943e4b096116775358449ca (patch)
tree2f3e220e25b105b9dc1f6e79148199cca936eeaf
parentc6ea09d6ef48882ebe5804bd0c2debde4d094a38 (diff)
downloadrockbox-dc33e1e8a7557c82a943e4b096116775358449ca.tar.gz
rockbox-dc33e1e8a7557c82a943e4b096116775358449ca.zip
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
-rw-r--r--apps/misc.c8
-rw-r--r--apps/misc.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/apps/misc.c b/apps/misc.c
index fb83bdecc6..0a313395bf 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -62,10 +62,12 @@
62#include "misc.h" 62#include "misc.h"
63 63
64#ifdef BOOTFILE 64#ifdef BOOTFILE
65#ifndef USB_IPODSTYLE
65#include "textarea.h" 66#include "textarea.h"
66#include "rolo.h" 67#include "rolo.h"
67#include "yesno.h" 68#include "yesno.h"
68#endif 69#endif
70#endif
69 71
70/* Format a large-range value for output, using the appropriate unit so that 72/* Format a large-range value for output, using the appropriate unit so that
71 * the displayed value is in the range 1 <= display < 1000 (1024 for "binary" 73 * 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
773 scrobbler_flush_cache(); 775 scrobbler_flush_cache();
774 system_flush(); 776 system_flush();
775#ifdef BOOTFILE 777#ifdef BOOTFILE
778#ifndef USB_IPODSTYLE
776 check_bootfile(false); /* gets initial size */ 779 check_bootfile(false); /* gets initial size */
777#endif 780#endif
781#endif
778 usb_screen(); 782 usb_screen();
779#ifdef BOOTFILE 783#ifdef BOOTFILE
784#ifndef USB_IPODSTYLE
780 check_bootfile(true); 785 check_bootfile(true);
781#endif 786#endif
787#endif
782 system_restore(); 788 system_restore();
783 } 789 }
784 return SYS_USB_CONNECTED; 790 return SYS_USB_CONNECTED;
@@ -871,6 +877,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain)
871#endif 877#endif
872 878
873#ifdef BOOTFILE 879#ifdef BOOTFILE
880#ifndef USB_IPODSTYLE
874/* 881/*
875 memorize/compare details about the BOOTFILE 882 memorize/compare details about the BOOTFILE
876 we don't use dircache because it may not be up to date after 883 we don't use dircache because it may not be up to date after
@@ -914,3 +921,4 @@ void check_bootfile(bool do_rolo)
914 closedir(dir); 921 closedir(dir);
915} 922}
916#endif 923#endif
924#endif
diff --git a/apps/misc.h b/apps/misc.h
index 20cb84b9bf..b30942f47e 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);
100#endif 100#endif
101 101
102#ifdef BOOTFILE 102#ifdef BOOTFILE
103#ifndef USB_IPODSTYLE
103void check_bootfile(bool do_rolo); 104void check_bootfile(bool do_rolo);
104#endif 105#endif
106#endif
105 107
106#endif /* MISC_H */ 108#endif /* MISC_H */