devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

AMS Sansa: Make send_cmd() function a bit less complicated and save ~96 bytes.

Browse source 
Also move sd_wait_for_state() to immediately precede SD_READ/WRITE_MULTIPLE_BLOCK commands.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23692 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jack Halpin 2009-11-22 04:50:26 +00:00
parent 9b3619c1e6
commit 6df98f690d
1 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,36 +188,28 @@ void INT_MCI0(void)
static bool send_cmd(const int drive, const int cmd, const int arg, static bool send_cmd(const int drive, const int cmd, const int arg,
const int flags, long *response) const int flags, long *response)
{ {
int val, status; int status;
while(MCI_STATUS(drive) & MCI_CMD_ACTIVE);
if(MCI_COMMAND(drive) & MCI_COMMAND_ENABLE) /* clears existing command */
{
MCI_COMMAND(drive) = 0;
mci_delay();
}
val = cmd | MCI_COMMAND_ENABLE;
if(flags & MCI_RESP)
{
val |= MCI_COMMAND_RESPONSE;
if(flags & MCI_LONG_RESP)
val |= MCI_COMMAND_LONG_RESPONSE;
}
/* Clear old status flags */
MCI_CLEAR(drive) = 0x7ff; MCI_CLEAR(drive) = 0x7ff;
/* Load command argument or clear if none */
MCI_ARGUMENT(drive) = (flags & MCI_ARG) ? arg : 0; MCI_ARGUMENT(drive) = (flags & MCI_ARG) ? arg : 0;
MCI_COMMAND(drive) = val;
while(MCI_STATUS(drive) & MCI_CMD_ACTIVE); /* wait for cmd completion */ /* Construct MCI_COMMAND & enable CPSM */
MCI_COMMAND(drive) =
/*b0:5*/ cmd
/* b6 */| ((flags & (MCI_RESP|MCI_LONG_RESP)) ? MCI_COMMAND_RESPONSE : 0)
/* b7 */| ((flags & MCI_LONG_RESP) ? MCI_COMMAND_LONG_RESPONSE : 0)
/* b8 | MCI_COMMAND_INTERRUPT */
/* b9 | MCI_COMMAND_PENDING */ /*Only used with stream data transfer*/
/* b10*/| MCI_COMMAND_ENABLE; /* Enables CPSM */
/* Wait while cmd completes then disable CPSM */
while(MCI_STATUS(drive) & MCI_CMD_ACTIVE);
MCI_COMMAND(drive) = 0; MCI_COMMAND(drive) = 0;
MCI_ARGUMENT(drive) = ~0;
status = MCI_STATUS(drive); status = MCI_STATUS(drive);
MCI_CLEAR(drive) = 0x7ff;
if(flags & MCI_RESP) if(flags & MCI_RESP)
{ {
@ -723,12 +715,19 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
if(!(card_info[drive].ocr & (1<<30))) /* not SDHC */ if(!(card_info[drive].ocr & (1<<30))) /* not SDHC */
bank_start *= SD_BLOCK_SIZE; bank_start *= SD_BLOCK_SIZE;
if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL)) ret = sd_wait_for_state(drive, SD_TRAN);
if (ret < 0)
{ {
ret -= 3*20; ret -= 3*20;
goto sd_transfer_error; goto sd_transfer_error;
} }
if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL))
{
ret -= 4*20;
goto sd_transfer_error;
}
if(write) if(write)
dma_enable_channel(0, dma_buf, MCI_FIFO(drive), dma_enable_channel(0, dma_buf, MCI_FIFO(drive),
(drive == INTERNAL_AS3525) ? DMA_PERI_SD : DMA_PERI_SD_SLOT, (drive == INTERNAL_AS3525) ? DMA_PERI_SD : DMA_PERI_SD_SLOT,
@ -771,14 +770,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL)) if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL))
{ {
ret = -4*20; ret = -5*20;
goto sd_transfer_error;
}
ret = sd_wait_for_state(drive, SD_TRAN);
if (ret < 0)
{
ret -= 5*20;
goto sd_transfer_error; goto sd_transfer_error;
} }
} }