summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-08-01 20:21:34 +0000
committerJens Arnold <amiconn@rockbox.org>2007-08-01 20:21:34 +0000
commitffb3dfd241a537fb7323507f8ab34a512437c7d2 (patch)
tree8487ee5eb09a719988ffbcdb55aeed9235cd5633 /apps
parent39357e9235aba8527aab5edf6aaf5cbfe2891eb0 (diff)
downloadrockbox-ffb3dfd241a537fb7323507f8ab34a512437c7d2.zip
rockbox-ffb3dfd241a537fb7323507f8ab34a512437c7d2.tar.gz
rockbox-ffb3dfd241a537fb7323507f8ab34a512437c7d2.tar.bz2
rockbox-ffb3dfd241a537fb7323507f8ab34a512437c7d2.tar.xz
Fix some places for USB_NONE. Still some more complex cases left though.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14122 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/misc.c8
-rw-r--r--apps/misc.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/misc.c b/apps/misc.c
index e72f19e..acc1378 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -64,7 +64,7 @@
#include "misc.h"
#ifdef BOOTFILE
-#ifndef USB_IPODSTYLE
+#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
#include "textarea.h"
#include "rolo.h"
#include "yesno.h"
@@ -842,13 +842,13 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
scrobbler_flush_cache();
system_flush();
#ifdef BOOTFILE
-#ifndef USB_IPODSTYLE
+#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
check_bootfile(false); /* gets initial size */
#endif
#endif
usb_screen();
#ifdef BOOTFILE
-#ifndef USB_IPODSTYLE
+#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
check_bootfile(true);
#endif
#endif
@@ -944,7 +944,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain)
#endif
#ifdef BOOTFILE
-#ifndef USB_IPODSTYLE
+#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
/*
memorize/compare details about the BOOTFILE
we don't use dircache because it may not be up to date after
diff --git a/apps/misc.h b/apps/misc.h
index 25937fa..b1af859 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -101,7 +101,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain);
#endif
#ifdef BOOTFILE
-#ifndef USB_IPODSTYLE
+#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
void check_bootfile(bool do_rolo);
#endif
#endif