From ffb3dfd241a537fb7323507f8ab34a512437c7d2 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 1 Aug 2007 20:21:34 +0000 Subject: 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 --- apps/misc.c | 8 ++++---- apps/misc.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/misc.c b/apps/misc.c index e72f19eda9..acc1378ae5 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 25937fae29..b1af859aee 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 -- cgit v1.2.3