devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Correct the debug information displayed for SD card to match the CID register layout.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23908 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Chicoine 2009-12-09 15:32:22 +00:00
parent 360c536fab
commit 887d8180d2
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/debug_menu.c
View file

@ -1724,7 +1724,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
{ {
tCardInfo *card; tCardInfo *card;
int *cardnum = (int*)lists->data; int *cardnum = (int*)lists->data;
unsigned char card_name[7]; unsigned char card_name[6];
unsigned char pbuf[32]; unsigned char pbuf[32];
char *title = lists->title; char *title = lists->title;
static const unsigned char i_vmin[] = { 0, 1, 5, 10, 25, 35, 60, 100 }; static const unsigned char i_vmin[] = { 0, 1, 5, 10, 25, 35, 60, 100 };
@ -1751,15 +1751,21 @@ static int disk_callback(int btn, struct gui_synclist *lists)
if (card->initialized > 0) if (card->initialized > 0)
{ {
strlcpy(card_name, ((unsigned char*)card->cid) + 3, sizeof(card_name)); char temp[6] = "\0";
unsigned i;
for (i=0; i<sizeof(card_name); i++)
{
temp[i] = card_extract_bits(card->cid, (103-8*i), 8);
}
strlcpy(card_name, temp, sizeof(temp));
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, 55, 4), (int) card_extract_bits(card->cid, 63, 4),
(int) card_extract_bits(card->cid, 51, 4)); (int) card_extract_bits(card->cid, 59, 4));
simplelist_addline(SIMPLELIST_ADD_LINE, simplelist_addline(SIMPLELIST_ADD_LINE,
"Prod: %d/%d", "Prod: %d/%d",
#if (CONFIG_STORAGE & STORAGE_SD) #if (CONFIG_STORAGE & STORAGE_SD)
(int) card_extract_bits(card->cid, 11, 3), (int) card_extract_bits(card->cid, 11, 4),
(int) card_extract_bits(card->cid, 19, 8) + 2000 (int) card_extract_bits(card->cid, 19, 8) + 2000
#elif (CONFIG_STORAGE & STORAGE_MMC) #elif (CONFIG_STORAGE & STORAGE_MMC)
(int) card_extract_bits(card->cid, 15, 4), (int) card_extract_bits(card->cid, 15, 4),