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
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14269 a1c6a512-1295-4272-9138-f99709370657
diff --git a/apps/features.txt b/apps/features.txt
index a48634f..a80408d 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -124,10 +124,6 @@
scrollwheel
#endif
-#if defined(SIMULATOR)
-sim
-#endif
-
#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
soft_shutdown
#endif
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 4fd4ecf..5a6bcb8 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -7058,23 +7058,6 @@
</voice>
</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>
id: LANG_PLAYLIST
desc: Used when you need to say playlist, also voiced
user:
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 9f6d9a5..f01e8dc 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -125,10 +125,6 @@
return false;
}
-#ifdef SIMULATOR
-extern bool simulate_usb(void);
-#endif
-
#ifdef HAVE_LCD_CHARCELLS
#define SIZE_FMT "%s%s"
#else
@@ -399,18 +395,10 @@
(menu_function)view_runtime, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
(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,
&show_info_item, &show_credits_item, &show_runtime_item,
- &sleep_timer_call, &debug_menu_item
-#ifdef SIMULATOR
- ,&simulate_usb_item
-#endif
- );
+ &sleep_timer_call, &debug_menu_item);
/* INFO MENU */
/***********************************/
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index f455905..5cc312a 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -105,12 +105,6 @@
(void)s;
}
-bool simulate_usb(void)
-{
- usb_screen();
- return false;
-}
-
int rtc_read(int address)
{
return address ^ 0x55;