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

Remove the 'USB' menu item from the sim system menu, press the 'u' key to display the USB screen instead, will break binary lng files and voice files for the sims only

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2007-08-10 14:10:50 +00:00
parent 871b9d5501
commit ff2a93f723
4 changed files with 1 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/features.txt
View file

@ -124,10 +124,6 @@ rtc
scrollwheel scrollwheel
#endif #endif
#if defined(SIMULATOR)
sim
#endif
#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER) #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
soft_shutdown soft_shutdown
#endif #endif

17
apps/lang/english.lang
View file

@ -7057,23 +7057,6 @@
*: "Debug, keep out!" *: "Debug, keep out!"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_USB
desc: in the info menu
user:
<source>
*: none
sim: "USB (Sim)"
</source>
<dest>
*: none
sim: "USB (Sim)"
</dest>
<voice>
*: none
sim: ""
</voice>
</phrase>
<phrase> <phrase>
id: LANG_PLAYLIST id: LANG_PLAYLIST
desc: Used when you need to say playlist, also voiced desc: Used when you need to say playlist, also voiced

14
apps/menus/main_menu.c
View file

@ -125,10 +125,6 @@ static bool show_credits(void)
return false; return false;
} }
#ifdef SIMULATOR
extern bool simulate_usb(void);
#endif
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
#define SIZE_FMT "%s%s" #define SIZE_FMT "%s%s"
#else #else
@ -399,18 +395,10 @@ MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME),
(menu_function)view_runtime, NULL, NULL, Icon_NOICON); (menu_function)view_runtime, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
(menu_function)debug_menu, NULL, NULL, Icon_NOICON); (menu_function)debug_menu, NULL, NULL, Icon_NOICON);
#ifdef SIMULATOR
MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB),
(menu_function)simulate_usb, NULL, NULL, Icon_NOICON);
#endif
MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark, MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark,
&show_info_item, &show_credits_item, &show_runtime_item, &show_info_item, &show_credits_item, &show_runtime_item,
&sleep_timer_call, &debug_menu_item &sleep_timer_call, &debug_menu_item);
#ifdef SIMULATOR
,&simulate_usb_item
#endif
);
/* INFO MENU */ /* INFO MENU */
/***********************************/ /***********************************/

6
uisimulator/common/stubs.c
View file

@ -105,12 +105,6 @@ void ata_spindown(int s)
(void)s; (void)s;
} }
bool simulate_usb(void)
{
usb_screen();
return false;
}
int rtc_read(int address) int rtc_read(int address)
{ {
return address ^ 0x55; return address ^ 0x55;