Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21600 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2009-07-01 19:13:01 +00:00
parent 7ab33f165c
commit 93f6e3df24
5 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/debug_menu.c
View file

@ -1910,20 +1910,20 @@ static int disk_callback(int btn, struct gui_synclist *lists)
strncpy(card_name, ((unsigned char*)card->cid) + 3, 6); strncpy(card_name, ((unsigned char*)card->cid) + 3, 6);
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"%s Rev %d.%d", card_name, "%s Rev %d.%d", card_name,
(int) card_extract_bits(card->cid, 72, 4), (int) card_extract_bits(card->cid, 55, 4),
(int) card_extract_bits(card->cid, 76, 4)); (int) card_extract_bits(card->cid, 51, 4));
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"Prod: %d/%d", "Prod: %d/%d",
(int) card_extract_bits(card->cid, 112, 4), (int) card_extract_bits(card->cid, 15, 4),
(int) card_extract_bits(card->cid, 116, 4) + 1997); (int) card_extract_bits(card->cid, 11, 4) + 1997);
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"Ser#: 0x%08lx", "Ser#: 0x%08lx",
card_extract_bits(card->cid, 80, 32)); card_extract_bits(card->cid, 47, 32));
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"M=%02x, O=%04x", "M=%02x, O=%04x",
(int) card_extract_bits(card->cid, 0, 8), (int) card_extract_bits(card->cid, 127, 8),
(int) card_extract_bits(card->cid, 8, 16)); (int) card_extract_bits(card->cid, 119, 16));
int temp = card_extract_bits(card->csd, 2, 4); int temp = card_extract_bits(card->csd, 125, 4);
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
CARDTYPE " v%s", temp < 5 ? CARDTYPE " v%s", temp < 5 ?
spec_vers[temp] : "?.?"); spec_vers[temp] : "?.?");
@ -1943,12 +1943,12 @@ static int disk_callback(int btn, struct gui_synclist *lists)
"R2W: *%d", card->r2w_factor); "R2W: *%d", card->r2w_factor);
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"IRmax: %d..%d mA", "IRmax: %d..%d mA",
i_vmin[card_extract_bits(card->csd, 66, 3)], i_vmin[card_extract_bits(card->csd, 61, 3)],
i_vmax[card_extract_bits(card->csd, 69, 3)]); i_vmax[card_extract_bits(card->csd, 58, 3)]);
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"IWmax: %d..%d mA", "IWmax: %d..%d mA",
i_vmin[card_extract_bits(card->csd, 72, 3)], i_vmin[card_extract_bits(card->csd, 55, 3)],
i_vmax[card_extract_bits(card->csd, 75, 3)]); i_vmax[card_extract_bits(card->csd, 52, 3)]);
} }
else if (card->initialized == 0) else if (card->initialized == 0)
{ {

18
firmware/drivers/ata_mmc.c
View file

@ -425,25 +425,25 @@ static int initialize_card(int card_no)
if (rc) if (rc)
return rc * 10 - 5; return rc * 10 - 5;
blk_exp = card_extract_bits(card->csd, 44, 4); blk_exp = card_extract_bits(card->csd, 83, 4);
if (blk_exp < 9) /* block size < 512 bytes not supported */ if (blk_exp < 9) /* block size < 512 bytes not supported */
return -6; return -6;
card->numblocks = (card_extract_bits(card->csd, 54, 12) + 1) card->numblocks = (card_extract_bits(card->csd, 73, 12) + 1)
<< (card_extract_bits(card->csd, 78, 3) + 2 + blk_exp - 9); << (card_extract_bits(card->csd, 49, 3) + 2 + blk_exp - 9);
card->blocksize = BLOCK_SIZE; card->blocksize = BLOCK_SIZE;
/* max transmission speed, clock divider */ /* max transmission speed, clock divider */
ts_exp = card_extract_bits(card->csd, 29, 3); ts_exp = card_extract_bits(card->csd, 98, 3);
ts_exp = (ts_exp > 3) ? 3 : ts_exp; ts_exp = (ts_exp > 3) ? 3 : ts_exp;
card->speed = mantissa[card_extract_bits(card->csd, 25, 4)] card->speed = mantissa[card_extract_bits(card->csd, 102, 4)]
* exponent[ts_exp + 4]; * exponent[ts_exp + 4];
card->bitrate_register = (FREQ/4-1) / card->speed; card->bitrate_register = (FREQ/4-1) / card->speed;
/* NSAC, TAAC, read timeout */ /* NSAC, TAAC, read timeout */
card->nsac = 100 * card_extract_bits(card->csd, 16, 8); card->nsac = 100 * card_extract_bits(card->csd, 111, 8);
card->taac = mantissa[card_extract_bits(card->csd, 9, 4)]; card->taac = mantissa[card_extract_bits(card->csd, 118, 4)];
taac_exp = card_extract_bits(card->csd, 13, 3); taac_exp = card_extract_bits(card->csd, 114, 3);
card->read_timeout = ((FREQ/4) / (card->bitrate_register + 1) card->read_timeout = ((FREQ/4) / (card->bitrate_register + 1)
* card->taac / exponent[9 - taac_exp] * card->taac / exponent[9 - taac_exp]
+ (10 * card->nsac)); + (10 * card->nsac));
@ -451,7 +451,7 @@ static int initialize_card(int card_no)
card->taac = card->taac * exponent[taac_exp] / 10; card->taac = card->taac * exponent[taac_exp] / 10;
/* r2w_factor, write timeout */ /* r2w_factor, write timeout */
card->r2w_factor = BIT_N(card_extract_bits(card->csd, 99, 3)); card->r2w_factor = BIT_N(card_extract_bits(card->csd, 28, 3));
card->write_timeout = card->read_timeout * card->r2w_factor; card->write_timeout = card->read_timeout * card->r2w_factor;
if (card->r2w_factor > 32) /* Such cards often need extra read delay */ if (card->r2w_factor > 32) /* Such cards often need extra read delay */

9
firmware/hotswap.c
View file

@ -33,9 +33,14 @@ unsigned long card_extract_bits(
unsigned int start, /* bit no. to start reading */ unsigned int start, /* bit no. to start reading */
unsigned int size) /* how many bits to read */ unsigned int size) /* how many bits to read */
{ {
unsigned int long_index = start / 32; unsigned int long_index, bit_index;
unsigned int bit_index = start % 32;
unsigned long result; unsigned long result;
/* we assume words of CSD/CID are stored least significant word first */
start = 127 - start;
long_index = start / 32;
bit_index = start % 32;
result = p[long_index] << bit_index; result = p[long_index] << bit_index;

10
firmware/target/arm/ata-sd-pp.c
View file

@ -1306,12 +1306,12 @@ tCardInfo *card_get_info_target(int card_no)
for(i=0; i<4; i++) card.cid[i] = card_info[card_no].cid[3-i]; for(i=0; i<4; i++) card.cid[i] = card_info[card_no].cid[3-i];
card.numblocks = card_info[card_no].numblocks; card.numblocks = card_info[card_no].numblocks;
card.blocksize = card_info[card_no].blocksize; card.blocksize = card_info[card_no].blocksize;
temp = card_extract_bits(card.csd, 29, 3); temp = card_extract_bits(card.csd, 98, 3);
card.speed = mantissa[card_extract_bits(card.csd, 25, 4)] card.speed = mantissa[card_extract_bits(card.csd, 102, 4)]
* exponent[temp > 2 ? 7 : temp + 4]; * exponent[temp > 2 ? 7 : temp + 4];
card.nsac = 100 * card_extract_bits(card.csd, 16, 8); card.nsac = 100 * card_extract_bits(card.csd, 111, 8);
temp = card_extract_bits(card.csd, 13, 3); temp = card_extract_bits(card.csd, 114, 3);
card.taac = mantissa[card_extract_bits(card.csd, 9, 4)] card.taac = mantissa[card_extract_bits(card.csd, 118, 4)]
* exponent[temp] / 10; * exponent[temp] / 10;
card.cid[0] = htobe32(card.cid[0]); /* ascii chars here */ card.cid[0] = htobe32(card.cid[0]); /* ascii chars here */
card.cid[1] = htobe32(card.cid[1]); /* ascii chars here */ card.cid[1] = htobe32(card.cid[1]); /* ascii chars here */

10
firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
View file

@ -1675,12 +1675,12 @@ tCardInfo* card_get_info_target(int card_no)
card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i]; card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i];
for(i=0; i<4; i++) for(i=0; i<4; i++)
card.cid[i] = ((unsigned long*)&mmcinfo.cid)[i]; card.cid[i] = ((unsigned long*)&mmcinfo.cid)[i];
temp = card_extract_bits(card.csd, 29, 3); temp = card_extract_bits(card.csd, 98, 3);
card.speed = sd_mantissa[card_extract_bits(card.csd, 25, 4)] card.speed = sd_mantissa[card_extract_bits(card.csd, 102, 4)]
* sd_exponent[temp > 2 ? 7 : temp + 4]; * sd_exponent[temp > 2 ? 7 : temp + 4];
card.nsac = 100 * card_extract_bits(card.csd, 16, 8); card.nsac = 100 * card_extract_bits(card.csd, 111, 8);
temp = card_extract_bits(card.csd, 13, 3); temp = card_extract_bits(card.csd, 114, 3);
card.taac = sd_mantissa[card_extract_bits(card.csd, 9, 4)] card.taac = sd_mantissa[card_extract_bits(card.csd, 118, 4)]
* sd_exponent[temp] / 10; * sd_exponent[temp] / 10;
card.numblocks = mmcinfo.block_num; card.numblocks = mmcinfo.block_num;
card.blocksize = mmcinfo.block_len; card.blocksize = mmcinfo.block_len;