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

AMSv2: handle sd card ACMDs similar to how it's done for AMSv1

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28814 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken 2010-12-12 15:30:58 +00:00
parent 395d72f71a
commit 2a0a9a5f2a
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/target/arm/as3525/sd-as3525v2.c
View file

@ -64,6 +64,7 @@
#define MCI_NO_RESP (0<<0) #define MCI_NO_RESP (0<<0)
#define MCI_RESP (1<<0) #define MCI_RESP (1<<0)
#define MCI_LONG_RESP (1<<1) #define MCI_LONG_RESP (1<<1)
#define MCI_ACMD (1<<2)
/* controller registers */ /* controller registers */
#define SD_BASE 0xC6070000 #define SD_BASE 0xC6070000
@ -397,6 +398,10 @@ static bool send_cmd(const int drive, const int cmd, const int arg, const int fl
{ {
int card_no; int card_no;
if ((flags & MCI_ACMD) && /* send SD_APP_CMD first */
!send_cmd(drive, SD_APP_CMD, card_info[drive].rca, MCI_RESP, response))
return false;
#if defined(HAVE_MULTIDRIVE) #if defined(HAVE_MULTIDRIVE)
if(sd_present(SD_SLOT_AS3525)) if(sd_present(SD_SLOT_AS3525))
GPIOB_PIN(5) = (1-drive) << 5; GPIOB_PIN(5) = (1-drive) << 5;
@ -491,6 +496,8 @@ static int sd_init_card(const int drive)
long init_timeout; long init_timeout;
bool sd_v2 = false; bool sd_v2 = false;
card_info[drive].rca = 0;
/* assume 24 MHz clock / 60 = 400 kHz */ /* assume 24 MHz clock / 60 = 400 kHz */
MCI_CLKDIV = (MCI_CLKDIV & ~(0xFF)) | 0x3C; /* CLK_DIV_0 : bits 7:0 */ MCI_CLKDIV = (MCI_CLKDIV & ~(0xFF)) | 0x3C; /* CLK_DIV_0 : bits 7:0 */
@ -516,12 +523,9 @@ static int sd_init_card(const int drive)
if(TIME_AFTER(current_tick, init_timeout)) if(TIME_AFTER(current_tick, init_timeout))
return -2; return -2;
/* app_cmd */
send_cmd(drive, SD_APP_CMD, 0, MCI_RESP, &response);
/* ACMD41 For v2 cards set HCS bit[30] & send host voltage range to all */ /* ACMD41 For v2 cards set HCS bit[30] & send host voltage range to all */
if(!send_cmd(drive, SD_APP_OP_COND, (0x00FF8000 | (sd_v2 ? 1<<30 : 0)), if(!send_cmd(drive, SD_APP_OP_COND, (0x00FF8000 | (sd_v2 ? 1<<30 : 0)),
MCI_RESP, &card_info[drive].ocr)) MCI_ACMD|MCI_RESP, &card_info[drive].ocr))
return -3; return -3;
} while(!(card_info[drive].ocr & (1<<31)) ); } while(!(card_info[drive].ocr & (1<<31)) );
@ -583,18 +587,12 @@ static int sd_init_card(const int drive)
/* Switch to to 4 bit widebus mode */ /* Switch to to 4 bit widebus mode */
if(sd_wait_for_tran_state(drive) < 0) if(sd_wait_for_tran_state(drive) < 0)
return -13; return -13;
/* CMD55 */ /* Response is requested due to timing issue */
if(!send_cmd(drive, SD_APP_CMD, card_info[drive].rca, MCI_RESP, &response))
return -14;
/* ACMD6 */ /* ACMD6 */
if(!send_cmd(drive, SD_SET_BUS_WIDTH, 2, MCI_NO_RESP, NULL)) if(!send_cmd(drive, SD_SET_BUS_WIDTH, 2, MCI_ACMD|MCI_NO_RESP, NULL))
return -15; return -15;
mci_delay(); mci_delay();
/* CMD55 */ /* Response is requested due to timing issue */
if(!send_cmd(drive, SD_APP_CMD, card_info[drive].rca, MCI_RESP, &response))
return -16;
/* ACMD42 */ /* ACMD42 */
if(!send_cmd(drive, SD_SET_CLR_CARD_DETECT, 0, MCI_NO_RESP, NULL)) if(!send_cmd(drive, SD_SET_CLR_CARD_DETECT, 0, MCI_ACMD|MCI_NO_RESP, NULL))
return -17; return -17;
/* Now that card is widebus make controller aware */ /* Now that card is widebus make controller aware */