summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-09-29 01:10:32 +0000
committerJens Arnold <amiconn@rockbox.org>2004-09-29 01:10:32 +0000
commit6cb799174b121ad3505b6e323aa8e360fffcc7d5 (patch)
tree1e4cd8870e3ee2247d7e0d2929a179a4ffd0ce00 /firmware
parentde6f799ace0b26a045f657db8e97a9c0614be136 (diff)
downloadrockbox-6cb799174b121ad3505b6e323aa8e360fffcc7d5.tar.gz
rockbox-6cb799174b121ad3505b6e323aa8e360fffcc7d5.zip
Small fix for the card init
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5128 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/ata_mmc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index b4c2e844e0..0faf431836 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -139,6 +139,7 @@ static int select_card(int card_no)
139{ 139{
140 if (!card_info[card_no].initialized) 140 if (!card_info[card_no].initialized)
141 { 141 {
142 setup_sci1(7); /* Initial rate: 375 kbps (need <= 400 per mmc specs) */
142 write_transfer(dummy, 10); /* allow the card to synchronize */ 143 write_transfer(dummy, 10); /* allow the card to synchronize */
143 while (!(SSR1 & SCI_TEND)); 144 while (!(SSR1 & SCI_TEND));
144 } 145 }
@@ -359,9 +360,6 @@ static int initialize_card(int card_no)
359 1000000000, 100000000, 10000000, 1000000, 100000, 10000, 1000, 100 360 1000000000, 100000000, 10000000, 1000000, 100000, 10000, 1000, 100
360 }; 361 };
361 362
362 card->initialized = false;
363 setup_sci1(7); /* Initial rate: 375 kBit/s (need <= 400 per mmc specs) */
364
365 /* switch to SPI mode */ 363 /* switch to SPI mode */
366 send_cmd(CMD_GO_IDLE_STATE, 0, &response); 364 send_cmd(CMD_GO_IDLE_STATE, 0, &response);
367 if (response != 0x01) 365 if (response != 0x01)
@@ -425,7 +423,7 @@ static int initialize_card(int card_no)
425 423
426 card->rev = (cxd[9] & 0xF0) >> 4; 424 card->rev = (cxd[9] & 0xF0) >> 4;
427 card->rev_fract = cxd[9] & 0x0F; 425 card->rev_fract = cxd[9] & 0x0F;
428 426
429 card->manuf_month = (cxd[14] & 0xF0) >> 4; 427 card->manuf_month = (cxd[14] & 0xF0) >> 4;
430 card->manuf_year = (cxd[14] & 0x0F) + 1997; 428 card->manuf_year = (cxd[14] & 0x0F) + 1997;
431 429