mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
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
This commit is contained in:
parent
3e1b9d5fdd
commit
a7548d3bc7
5 changed files with 29 additions and 9 deletions
|
|
@ -522,7 +522,14 @@ bool sd_present(IF_MD_NONVOID(int drive))
|
|||
#ifndef HAVE_MULTIDRIVE
|
||||
const int drive=0;
|
||||
#endif
|
||||
return (card_info[drive].initialized && card_info[drive].numblocks > 0);
|
||||
if(drive==0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return card_detect_target();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1345,7 +1345,14 @@ bool sd_present(IF_MD_NONVOID(int drive))
|
|||
#ifndef HAVE_MULTIDRIVE
|
||||
const int drive=0;
|
||||
#endif
|
||||
return (card_info[drive].initialized && card_info[drive].numblocks > 0);
|
||||
if(drive==0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return card_detect_target();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -252,11 +252,10 @@ bool sd_removable(IF_MD_NONVOID(int card_no))
|
|||
|
||||
bool sd_present(IF_MD_NONVOID(int card_no))
|
||||
{
|
||||
#ifndef HAVE_MULTIDRIVE
|
||||
const int card_no = 0;
|
||||
#ifdef HAVE_MULTIDRIVE
|
||||
(void)card_no;
|
||||
#endif
|
||||
return (card_info[card_no].initialized &&
|
||||
card_info[card_no].numblocks > 0);
|
||||
return card_detect_target();
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue