From 93f6e3df246ff50c24524c9d329f27a06e1845db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Wed, 1 Jul 2009 19:13:01 +0000 Subject: 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 --- apps/debug_menu.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'apps/debug_menu.c') diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 97bd698..ab2f282 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1910,20 +1910,20 @@ static int disk_callback(int btn, struct gui_synclist *lists) strncpy(card_name, ((unsigned char*)card->cid) + 3, 6); simplelist_addline(SIMPLELIST_ADD_LINE, "%s Rev %d.%d", card_name, - (int) card_extract_bits(card->cid, 72, 4), - (int) card_extract_bits(card->cid, 76, 4)); + (int) card_extract_bits(card->cid, 55, 4), + (int) card_extract_bits(card->cid, 51, 4)); simplelist_addline(SIMPLELIST_ADD_LINE, "Prod: %d/%d", - (int) card_extract_bits(card->cid, 112, 4), - (int) card_extract_bits(card->cid, 116, 4) + 1997); + (int) card_extract_bits(card->cid, 15, 4), + (int) card_extract_bits(card->cid, 11, 4) + 1997); simplelist_addline(SIMPLELIST_ADD_LINE, "Ser#: 0x%08lx", - card_extract_bits(card->cid, 80, 32)); + card_extract_bits(card->cid, 47, 32)); simplelist_addline(SIMPLELIST_ADD_LINE, "M=%02x, O=%04x", - (int) card_extract_bits(card->cid, 0, 8), - (int) card_extract_bits(card->cid, 8, 16)); - int temp = card_extract_bits(card->csd, 2, 4); + (int) card_extract_bits(card->cid, 127, 8), + (int) card_extract_bits(card->cid, 119, 16)); + int temp = card_extract_bits(card->csd, 125, 4); simplelist_addline(SIMPLELIST_ADD_LINE, CARDTYPE " v%s", temp < 5 ? spec_vers[temp] : "?.?"); @@ -1943,12 +1943,12 @@ static int disk_callback(int btn, struct gui_synclist *lists) "R2W: *%d", card->r2w_factor); simplelist_addline(SIMPLELIST_ADD_LINE, "IRmax: %d..%d mA", - i_vmin[card_extract_bits(card->csd, 66, 3)], - i_vmax[card_extract_bits(card->csd, 69, 3)]); + i_vmin[card_extract_bits(card->csd, 61, 3)], + i_vmax[card_extract_bits(card->csd, 58, 3)]); simplelist_addline(SIMPLELIST_ADD_LINE, "IWmax: %d..%d mA", - i_vmin[card_extract_bits(card->csd, 72, 3)], - i_vmax[card_extract_bits(card->csd, 75, 3)]); + i_vmin[card_extract_bits(card->csd, 55, 3)], + i_vmax[card_extract_bits(card->csd, 52, 3)]); } else if (card->initialized == 0) { -- cgit v1.1