diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2007-06-30 02:08:27 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2007-06-30 02:08:27 +0000 |
| commit | 1167e3c72f5d0d581b81fd2cb8f2580a1524ca5a (patch) | |
| tree | 501f9901636d5586271067d0c157204e500a2cfd /firmware/common/disk.c | |
| parent | 189a5f812f47e43e5704a44c3abb85a4c37c8662 (diff) | |
| download | rockbox-1167e3c72f5d0d581b81fd2cb8f2580a1524ca5a.tar.gz rockbox-1167e3c72f5d0d581b81fd2cb8f2580a1524ca5a.zip | |
Accept FS#7134 - Sansa: external sd card support by Antonius Hellmann with some tweaks. All testers have given the green light. (Now for the RED ?? ;).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13741 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/common/disk.c')
| -rw-r--r-- | firmware/common/disk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c index ebf8103aa0..f491c9b26a 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c @@ -20,8 +20,8 @@ #include "ata.h" #include "debug.h" #include "fat.h" -#ifdef HAVE_MMC -#include "ata_mmc.h" +#ifdef HAVE_HOTSWAP +#include "hotswap.h" #endif #include "file.h" /* for release_dirs() */ #include "dir.h" /* for release_files() */ @@ -101,8 +101,8 @@ int disk_mount_all(void) int mounted; int i; -#if defined(HAVE_MMC) && defined(HAVE_HOTSWAP) - mmc_enable_monitoring(false); +#ifdef HAVE_MMC + card_enable_monitoring(false); #endif fat_init(); /* reset all mounted partitions */ @@ -110,13 +110,13 @@ int disk_mount_all(void) vol_drive[i] = -1; /* mark all as unassigned */ mounted = disk_mount(0); -#ifdef HAVE_MMC - if (mmc_detect()) /* for Ondio, only if card detected */ +#ifdef HAVE_HOTSWAP + if (card_detect()) { mounted += disk_mount(1); /* try 2nd "drive", too */ } -#ifdef HAVE_HOTSWAP - mmc_enable_monitoring(true); +#ifdef HAVE_MMC + card_enable_monitoring(true); #endif #endif |