diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-07-01 19:13:01 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-07-01 19:13:01 +0000 |
commit | 93f6e3df246ff50c24524c9d329f27a06e1845db (patch) | |
tree | 9a625a9dd00b34fc8cd317840c41f27e0f33ea00 /firmware/target/arm | |
parent | 7ab33f165ca92c5cbaa76c57cf861fd4c72b1930 (diff) | |
download | rockbox-93f6e3df246ff50c24524c9d329f27a06e1845db.tar.gz rockbox-93f6e3df246ff50c24524c9d329f27a06e1845db.zip |
card_extract_bits() take the start bit argument as defined in public SanDisk specifications for SD and MMC, i.e. bit 0 is the lsb
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21600 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/ata-sd-pp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c index ade5b8090b..8f30195791 100644 --- a/firmware/target/arm/ata-sd-pp.c +++ b/firmware/target/arm/ata-sd-pp.c | |||
@@ -1306,12 +1306,12 @@ tCardInfo *card_get_info_target(int card_no) | |||
1306 | for(i=0; i<4; i++) card.cid[i] = card_info[card_no].cid[3-i]; | 1306 | for(i=0; i<4; i++) card.cid[i] = card_info[card_no].cid[3-i]; |
1307 | card.numblocks = card_info[card_no].numblocks; | 1307 | card.numblocks = card_info[card_no].numblocks; |
1308 | card.blocksize = card_info[card_no].blocksize; | 1308 | card.blocksize = card_info[card_no].blocksize; |
1309 | temp = card_extract_bits(card.csd, 29, 3); | 1309 | temp = card_extract_bits(card.csd, 98, 3); |
1310 | card.speed = mantissa[card_extract_bits(card.csd, 25, 4)] | 1310 | card.speed = mantissa[card_extract_bits(card.csd, 102, 4)] |
1311 | * exponent[temp > 2 ? 7 : temp + 4]; | 1311 | * exponent[temp > 2 ? 7 : temp + 4]; |
1312 | card.nsac = 100 * card_extract_bits(card.csd, 16, 8); | 1312 | card.nsac = 100 * card_extract_bits(card.csd, 111, 8); |
1313 | temp = card_extract_bits(card.csd, 13, 3); | 1313 | temp = card_extract_bits(card.csd, 114, 3); |
1314 | card.taac = mantissa[card_extract_bits(card.csd, 9, 4)] | 1314 | card.taac = mantissa[card_extract_bits(card.csd, 118, 4)] |
1315 | * exponent[temp] / 10; | 1315 | * exponent[temp] / 10; |
1316 | card.cid[0] = htobe32(card.cid[0]); /* ascii chars here */ | 1316 | card.cid[0] = htobe32(card.cid[0]); /* ascii chars here */ |
1317 | card.cid[1] = htobe32(card.cid[1]); /* ascii chars here */ | 1317 | card.cid[1] = htobe32(card.cid[1]); /* ascii chars here */ |