diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2009-07-20 19:46:36 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2009-07-20 19:46:36 +0000 |
commit | 534cd216a0747d66b5b37f29a858119448d67fde (patch) | |
tree | 6abd9ffa270e322c603254a91f6f330c3e0797a3 | |
parent | b6d92e8a1b332317cc02426a2906d94ff28286ac (diff) | |
download | rockbox-534cd216a0747d66b5b37f29a858119448d67fde.tar.gz rockbox-534cd216a0747d66b5b37f29a858119448d67fde.zip |
sd_first_drive is only used when HAVE_HOTSWAP is defined, so add appropriate #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21985 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/ata-sd-pp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c index 78a2a4f3a4..f2efd02e9d 100644 --- a/firmware/target/arm/ata-sd-pp.c +++ b/firmware/target/arm/ata-sd-pp.c | |||
@@ -180,7 +180,9 @@ static const char sd_thread_name[] = "ata/sd"; | |||
180 | static struct mutex sd_mtx SHAREDBSS_ATTR; | 180 | static struct mutex sd_mtx SHAREDBSS_ATTR; |
181 | static struct event_queue sd_queue; | 181 | static struct event_queue sd_queue; |
182 | 182 | ||
183 | #ifdef HAVE_HOTSWAP | ||
183 | static int sd_first_drive = 0; | 184 | static int sd_first_drive = 0; |
185 | #endif | ||
184 | 186 | ||
185 | /* Posted when card plugged status has changed */ | 187 | /* Posted when card plugged status has changed */ |
186 | #define SD_HOTSWAP 1 | 188 | #define SD_HOTSWAP 1 |
@@ -1359,8 +1361,12 @@ bool sd_present(IF_MD_NONVOID(int drive)) | |||
1359 | #ifdef CONFIG_STORAGE_MULTI | 1361 | #ifdef CONFIG_STORAGE_MULTI |
1360 | int sd_num_drives(int first_drive) | 1362 | int sd_num_drives(int first_drive) |
1361 | { | 1363 | { |
1364 | #ifdef HAVE_HOTSWAP | ||
1362 | /* Store which logical drive number(s) we have been assigned */ | 1365 | /* Store which logical drive number(s) we have been assigned */ |
1363 | sd_first_drive = first_drive; | 1366 | sd_first_drive = first_drive; |
1367 | #else | ||
1368 | (void)first_drive; | ||
1369 | #endif | ||
1364 | 1370 | ||
1365 | #ifdef HAVE_MULTIDRIVE | 1371 | #ifdef HAVE_MULTIDRIVE |
1366 | return 2; | 1372 | return 2; |