diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2009-07-20 13:47:21 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2009-07-20 13:47:21 +0000 |
commit | a7548d3bc7b4cb91553a59a06490290869270437 (patch) | |
tree | adf85b2bc2fd74f45c18b54fcfe1aaf4d77fa05f /firmware/target/arm | |
parent | 3e1b9d5fdd73d97b3be5043f2cfa2176c1d441a1 (diff) | |
download | rockbox-a7548d3bc7b4cb91553a59a06490290869270437.tar.gz rockbox-a7548d3bc7b4cb91553a59a06490290869270437.zip |
Make sd_present() and mmc_present() look only at the actual presence of a card, not at initialisation state
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21981 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/as3525/ata_sd_as3525.c | 9 | ||||
-rw-r--r-- | firmware/target/arm/ata-sd-pp.c | 9 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/sd-tcc780x.c | 7 |
3 files changed, 19 insertions, 6 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index bca52a09f1..995bf932ca 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c | |||
@@ -522,7 +522,14 @@ bool sd_present(IF_MD_NONVOID(int drive)) | |||
522 | #ifndef HAVE_MULTIDRIVE | 522 | #ifndef HAVE_MULTIDRIVE |
523 | const int drive=0; | 523 | const int drive=0; |
524 | #endif | 524 | #endif |
525 | return (card_info[drive].initialized && card_info[drive].numblocks > 0); | 525 | if(drive==0) |
526 | { | ||
527 | return true; | ||
528 | } | ||
529 | else | ||
530 | { | ||
531 | return card_detect_target(); | ||
532 | } | ||
526 | } | 533 | } |
527 | #endif | 534 | #endif |
528 | 535 | ||
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c index f963e0ac48..78a2a4f3a4 100644 --- a/firmware/target/arm/ata-sd-pp.c +++ b/firmware/target/arm/ata-sd-pp.c | |||
@@ -1345,7 +1345,14 @@ bool sd_present(IF_MD_NONVOID(int drive)) | |||
1345 | #ifndef HAVE_MULTIDRIVE | 1345 | #ifndef HAVE_MULTIDRIVE |
1346 | const int drive=0; | 1346 | const int drive=0; |
1347 | #endif | 1347 | #endif |
1348 | return (card_info[drive].initialized && card_info[drive].numblocks > 0); | 1348 | if(drive==0) |
1349 | { | ||
1350 | return true; | ||
1351 | } | ||
1352 | else | ||
1353 | { | ||
1354 | return card_detect_target(); | ||
1355 | } | ||
1349 | } | 1356 | } |
1350 | #endif | 1357 | #endif |
1351 | 1358 | ||
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c index 8b0ac8a8a6..bb426d8125 100644 --- a/firmware/target/arm/tcc780x/sd-tcc780x.c +++ b/firmware/target/arm/tcc780x/sd-tcc780x.c | |||
@@ -252,11 +252,10 @@ bool sd_removable(IF_MD_NONVOID(int card_no)) | |||
252 | 252 | ||
253 | bool sd_present(IF_MD_NONVOID(int card_no)) | 253 | bool sd_present(IF_MD_NONVOID(int card_no)) |
254 | { | 254 | { |
255 | #ifndef HAVE_MULTIDRIVE | 255 | #ifdef HAVE_MULTIDRIVE |
256 | const int card_no = 0; | 256 | (void)card_no; |
257 | #endif | 257 | #endif |
258 | return (card_info[card_no].initialized && | 258 | return card_detect_target(); |
259 | card_info[card_no].numblocks > 0); | ||
260 | } | 259 | } |
261 | 260 | ||
262 | #else | 261 | #else |