From 19d1cacb1a63c306d842f81127d382512c49a062 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Fri, 31 Oct 2008 21:25:04 +0000 Subject: cleanup storage defines git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18950 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/fat.c | 2 +- firmware/drivers/serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/drivers') diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 3130a3e2b4..90be93f4f4 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c @@ -204,7 +204,7 @@ static char fat_cache_sectors[FAT_CACHE_SIZE][SECTOR_SIZE]; static struct fat_cache_entry fat_cache[FAT_CACHE_SIZE]; static struct mutex cache_mutex SHAREDBSS_ATTR; -#if defined(HAVE_HOTSWAP) && !defined(HAVE_MMC) /* A better condition ?? */ +#if defined(HAVE_HOTSWAP) && !(CONFIG_STORAGE & STORAGE_MMC) /* A better condition ?? */ void fat_lock(void) { mutex_lock(&cache_mutex); diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index 961974e987..47fbf564ff 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c @@ -39,7 +39,7 @@ /* iFP7xx has no remote */ #if !defined(HAVE_FMADC) /* Recorder FM/V2 has no remote control pin */ \ - && !defined(HAVE_MMC) /* MMC takes serial port 1, so don't mess with it */ + && !(CONFIG_STORAGE & STORAGE_MMC) /* MMC takes serial port 1, so don't mess with it */ /* Received byte identifiers */ #define PLAY 0xC1 @@ -146,7 +146,7 @@ int remote_control_rx(void) return ret; } -#endif /* !HAVE_FMADC && !HAVE_MMC */ +#endif /* !HAVE_FMADC && !STORAGE_MMC */ #elif defined(CPU_COLDFIRE) && defined(HAVE_SERIAL) void serial_tx(const unsigned char *buf) -- cgit v1.2.3