summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-05-14 17:23:13 +0000
committerJens Arnold <amiconn@rockbox.org>2005-05-14 17:23:13 +0000
commit268f0b43376524b1e05e4d67f3e41a88356eea68 (patch)
tree228def432643443fc88961f88e2cd57dcb3f9e05 /firmware
parent5bb707258a44bd8fbb46eac951d091a9fa5d0c90 (diff)
downloadrockbox-268f0b43376524b1e05e4d67f3e41a88356eea68.tar.gz
rockbox-268f0b43376524b1e05e4d67f3e41a88356eea68.zip
Some code cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6471 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/ata_mmc.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index 02ec72a1f2..5afb6ca8a1 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -178,6 +178,8 @@ void mmc_select_clock(int card_no)
static int select_card(int card_no)
{
+ mutex_lock(&mmc_mutex);
+ led(true);
mmc_select_clock(card_no);
last_disk_activity = current_tick;
@@ -209,6 +211,8 @@ static void deselect_card(void)
while (!(SSR1 & SCI_TEND)); /* wait for end of transfer */
or_b(0x06, &PADRH); /* deassert CS (both cards) */
+ led(false);
+ mutex_unlock(&mmc_mutex);
last_disk_activity = current_tick;
}
@@ -527,10 +531,8 @@ tCardInfo *mmc_card_info(int card_no)
if (!card->initialized && ((card_no == 0) || mmc_detect()))
{
- mutex_lock(&mmc_mutex);
select_card(card_no);
deselect_card();
- mutex_unlock(&mmc_mutex);
}
return card;
}
@@ -692,19 +694,15 @@ int ata_read_sectors(IF_MV2(int drive,)
unsigned long c_block, c_end_block;
unsigned char response;
tCardInfo *card;
+#ifndef HAVE_MULTIVOLUME
+ int drive = current_card;
+#endif
c_addr = start * SECTOR_SIZE;
c_end_addr = c_addr + incount * SECTOR_SIZE;
- mutex_lock(&mmc_mutex);
- led(true);
-#ifdef HAVE_MULTIVOLUME
card = &card_info[drive];
rc = select_card(drive);
-#else
- card = &card_info[current_card];
- rc = select_card(current_card);
-#endif
if (rc)
{
rc = rc * 10 - 1;
@@ -798,8 +796,6 @@ int ata_read_sectors(IF_MV2(int drive,)
error:
deselect_card();
- led(false);
- mutex_unlock(&mmc_mutex);
/* only flush if reading went ok */
if ( (rc == 0) && delayed_write )
@@ -819,6 +815,9 @@ int ata_write_sectors(IF_MV2(int drive,)
unsigned long c_block, c_end_block;
unsigned char response;
tCardInfo *card;
+#ifndef HAVE_MULTIVOLUME
+ int drive = current_card;
+#endif
if (start == 0)
panicf("Writing on sector 0\n");
@@ -826,15 +825,8 @@ int ata_write_sectors(IF_MV2(int drive,)
c_addr = start * SECTOR_SIZE;
c_end_addr = c_addr + count * SECTOR_SIZE;
- mutex_lock(&mmc_mutex);
- led(true);
-#ifdef HAVE_MULTIVOLUME
card = &card_info[drive];
rc = select_card(drive);
-#else
- card = &card_info[current_card];
- rc = select_card(current_card);
-#endif
if (rc)
{
rc = rc * 10 - 1;
@@ -959,8 +951,6 @@ int ata_write_sectors(IF_MV2(int drive,)
error:
deselect_card();
- led(false);
- mutex_unlock(&mmc_mutex);
/* only flush if writing went ok */
if ( (rc == 0) && delayed_write )