len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 05:05:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add #ifdef HAVE_MULTIDRIVE to HS timings switch for uSD cards.

Browse source 
Internal cards are v1 sd cards so no need to include this code for the clip.

Move transition from STBY -> TRAN-> STBY states inside the if(sd_v2) conditional check for HS switch as it's not needed for non HS cards.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23331 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jack Halpin 2009-10-24 16:42:24 +00:00
parent dacbb5d22a
commit 5897249c1e
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
firmware/target/arm/as3525/ata_sd_as3525.c
View file

@ -310,25 +310,27 @@ static int sd_init_card(const int drive)
MCI_CLOCK(drive) |= MCI_CLOCK_BYPASS; /* FIXME: 50 MHz is spec limit */ MCI_CLOCK(drive) |= MCI_CLOCK_BYPASS; /* FIXME: 50 MHz is spec limit */
mci_delay(); mci_delay();
/* CMD7 w/rca: Select card to put it in TRAN state */ #ifdef HAVE_MULTIDRIVE
if(!send_cmd(drive, SD_SELECT_CARD, card_info[drive].rca, MCI_ARG, NULL))
return -7;
/* Try to switch V2 cards to HS timings, non HS seem to ignore this */ /* Try to switch V2 cards to HS timings, non HS seem to ignore this */
if(sd_v2) if(sd_v2)
{ {
/* CMD7 w/rca: Select card to put it in TRAN state */
if(!send_cmd(drive, SD_SELECT_CARD, card_info[drive].rca, MCI_ARG, NULL))
return -7;
if(sd_wait_for_state(drive, SD_TRAN)) if(sd_wait_for_state(drive, SD_TRAN))
return -8; return -8;
/* CMD6 */ /* CMD6 */
if(!send_cmd(drive, SD_SWITCH_FUNC, 0x80fffff1, MCI_ARG, NULL)) if(!send_cmd(drive, SD_SWITCH_FUNC, 0x80fffff1, MCI_ARG, NULL))
return -9; return -9;
mci_delay(); mci_delay();
}
/* go back to STBY state so we can read csd */ /* go back to STBY state so we can read csd */
/* CMD7 w/rca=0: Deselect card to put it in STBY state */ /* CMD7 w/rca=0: Deselect card to put it in STBY state */
if(!send_cmd(drive, SD_DESELECT_CARD, 0, MCI_ARG, NULL)) if(!send_cmd(drive, SD_DESELECT_CARD, 0, MCI_ARG, NULL))
return -10; return -10;
}
#endif /* HAVE_MULTIDRIVE */
/* CMD9 send CSD */ /* CMD9 send CSD */
if(!send_cmd(drive, SD_SEND_CSD, card_info[drive].rca, if(!send_cmd(drive, SD_SEND_CSD, card_info[drive].rca,