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

Fix radio screen, and use the actual card type name for the title in the disk screen on ondio and sansa

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13877 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-07-14 08:55:47 +00:00
parent 1a059e5f67
commit 5890f60137
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/debug_menu.c
View file

@ -1607,6 +1607,11 @@ static bool view_battery(void)
#ifndef SIMULATOR #ifndef SIMULATOR
#if defined(HAVE_MMC) || defined(HAVE_HOTSWAP) #if defined(HAVE_MMC) || defined(HAVE_HOTSWAP)
#if defined(HAVE_MMC)
#define CARDTYPE "MMC"
#else
#define CARDTYPE "microSD"
#endif
static int cardinfo_lines = 0, static int cardinfo_lines = 0,
current_card = 1; /* the first call changes this card to 0 */ current_card = 1; /* the first call changes this card to 0 */
static int cardinfo_callback(int btn, struct gui_synclist *lists) static int cardinfo_callback(int btn, struct gui_synclist *lists)
@ -1648,7 +1653,7 @@ static int cardinfo_callback(int btn, struct gui_synclist *lists)
(int) card_extract_bits(card->cid, 8, 16)); (int) card_extract_bits(card->cid, 8, 16));
int temp = card_extract_bits(card->csd, 2, 4); int temp = card_extract_bits(card->csd, 2, 4);
snprintf(debug_list_messages[cardinfo_lines++], DEBUG_MSG_LEN, snprintf(debug_list_messages[cardinfo_lines++], DEBUG_MSG_LEN,
"MMC v%s", temp < 5 ? CARDTYPE " v%s", temp < 5 ?
spec_vers[temp] : "?.?"); spec_vers[temp] : "?.?");
snprintf(debug_list_messages[cardinfo_lines++], DEBUG_MSG_LEN, snprintf(debug_list_messages[cardinfo_lines++], DEBUG_MSG_LEN,
"Blocks: 0x%06lx", card->numblocks); "Blocks: 0x%06lx", card->numblocks);
@ -1685,7 +1690,7 @@ static int cardinfo_callback(int btn, struct gui_synclist *lists)
if (lists) if (lists)
{ {
snprintf(listtitle, sizeof listtitle, snprintf(listtitle, sizeof listtitle,
"[MMC/microSD %d]", current_card); "[" CARDTYPE " %d]", current_card);
gui_synclist_set_title(lists, listtitle, NOICON); gui_synclist_set_title(lists, listtitle, NOICON);
gui_synclist_select_item(lists, 0); gui_synclist_select_item(lists, 0);
gui_synclist_set_nb_items(lists, cardinfo_lines); gui_synclist_set_nb_items(lists, cardinfo_lines);
@ -1698,7 +1703,7 @@ static bool dbg_disk_info(void)
{ {
current_card = 1; /* the callback changes this to 0 */ current_card = 1; /* the callback changes this to 0 */
cardinfo_callback(ACTION_STD_OK, 0); cardinfo_callback(ACTION_STD_OK, 0);
dbg_list("[MMC/microSD 0]", cardinfo_lines, 1, dbg_list("[" CARDTYPE " 0]", cardinfo_lines, 1,
cardinfo_callback, dbg_listmessage_getname); cardinfo_callback, dbg_listmessage_getname);
return false; return false;
} }
@ -1943,6 +1948,7 @@ int radio_lines = 0;
static int radio_callback(int btn, struct gui_synclist *lists) static int radio_callback(int btn, struct gui_synclist *lists)
{ {
(void)btn; (void)lists; (void)btn; (void)lists;
radio_lines = 0;
if (radio_hardware_present()) if (radio_hardware_present())
{ {
snprintf(debug_list_messages[radio_lines++], DEBUG_MSG_LEN, snprintf(debug_list_messages[radio_lines++], DEBUG_MSG_LEN,