summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-10-29 18:32:24 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-10-29 18:32:24 +0000
commit83589f040a0fbf5eeffdd0ac376a228a84d73159 (patch)
tree27bd2844098a5409e1a49063766888eb15145550
parent593809c1a963eb8bc93c5722867e519793b6861d (diff)
downloadrockbox-83589f040a0fbf5eeffdd0ac376a228a84d73159.tar.gz
rockbox-83589f040a0fbf5eeffdd0ac376a228a84d73159.zip
correct HAVE_MULTIVOLUME vs HAVE_HOTSWAP usage
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18924 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/ata-sd-pp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index fbbaf09b5d..b15b3634d8 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -127,7 +127,7 @@
#define SD_APP_OP_COND 41
/** global, exported variables **/
-#ifdef HAVE_HOTSWAP
+#ifdef HAVE_MULTIVOLUME
#define NUM_VOLUMES 2
#else
#define NUM_VOLUMES 1
@@ -156,7 +156,7 @@ struct sd_card_status
static struct sd_card_status sd_status[NUM_VOLUMES] =
{
{ 0, 1 },
-#ifdef HAVE_HOTSWAP
+#ifdef HAVE_MULTIVOLUME
{ 0, 10 }
#endif
};
@@ -794,7 +794,7 @@ static void ata_led(bool onoff)
int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int incount,
void* inbuf)
{
-#ifndef HAVE_HOTSWAP
+#ifndef HAVE_MULTIVOLUME
const int drive = 0;
#endif
int ret;
@@ -911,7 +911,7 @@ int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count,
/* Write support is not finished yet */
/* TODO: The standard suggests using ACMD23 prior to writing multiple blocks
to improve performance */
-#ifndef HAVE_HOTSWAP
+#ifndef HAVE_MULTIVOLUME
const int drive = 0;
#endif
int ret;