diff options
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | apps/lang/english.lang | 17 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 14 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 6 |
4 files changed, 1 insertions, 40 deletions
diff --git a/apps/features.txt b/apps/features.txt index a48634f26d..a80408de8b 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -124,10 +124,6 @@ rtc | |||
124 | scrollwheel | 124 | scrollwheel |
125 | #endif | 125 | #endif |
126 | 126 | ||
127 | #if defined(SIMULATOR) | ||
128 | sim | ||
129 | #endif | ||
130 | |||
131 | #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER) | 127 | #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER) |
132 | soft_shutdown | 128 | soft_shutdown |
133 | #endif | 129 | #endif |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 4fd4ecf54d..5a6bcb8d3f 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -7058,23 +7058,6 @@ | |||
7058 | </voice> | 7058 | </voice> |
7059 | </phrase> | 7059 | </phrase> |
7060 | <phrase> | 7060 | <phrase> |
7061 | id: LANG_USB | ||
7062 | desc: in the info menu | ||
7063 | user: | ||
7064 | <source> | ||
7065 | *: none | ||
7066 | sim: "USB (Sim)" | ||
7067 | </source> | ||
7068 | <dest> | ||
7069 | *: none | ||
7070 | sim: "USB (Sim)" | ||
7071 | </dest> | ||
7072 | <voice> | ||
7073 | *: none | ||
7074 | sim: "" | ||
7075 | </voice> | ||
7076 | </phrase> | ||
7077 | <phrase> | ||
7078 | id: LANG_PLAYLIST | 7061 | id: LANG_PLAYLIST |
7079 | desc: Used when you need to say playlist, also voiced | 7062 | desc: Used when you need to say playlist, also voiced |
7080 | user: | 7063 | user: |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 9f6d9a527c..f01e8dc23a 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -125,10 +125,6 @@ static bool show_credits(void) | |||
125 | return false; | 125 | return false; |
126 | } | 126 | } |
127 | 127 | ||
128 | #ifdef SIMULATOR | ||
129 | extern bool simulate_usb(void); | ||
130 | #endif | ||
131 | |||
132 | #ifdef HAVE_LCD_CHARCELLS | 128 | #ifdef HAVE_LCD_CHARCELLS |
133 | #define SIZE_FMT "%s%s" | 129 | #define SIZE_FMT "%s%s" |
134 | #else | 130 | #else |
@@ -399,18 +395,10 @@ MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), | |||
399 | (menu_function)view_runtime, NULL, NULL, Icon_NOICON); | 395 | (menu_function)view_runtime, NULL, NULL, Icon_NOICON); |
400 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), | 396 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), |
401 | (menu_function)debug_menu, NULL, NULL, Icon_NOICON); | 397 | (menu_function)debug_menu, NULL, NULL, Icon_NOICON); |
402 | #ifdef SIMULATOR | ||
403 | MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB), | ||
404 | (menu_function)simulate_usb, NULL, NULL, Icon_NOICON); | ||
405 | #endif | ||
406 | 398 | ||
407 | MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark, | 399 | MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark, |
408 | &show_info_item, &show_credits_item, &show_runtime_item, | 400 | &show_info_item, &show_credits_item, &show_runtime_item, |
409 | &sleep_timer_call, &debug_menu_item | 401 | &sleep_timer_call, &debug_menu_item); |
410 | #ifdef SIMULATOR | ||
411 | ,&simulate_usb_item | ||
412 | #endif | ||
413 | ); | ||
414 | /* INFO MENU */ | 402 | /* INFO MENU */ |
415 | /***********************************/ | 403 | /***********************************/ |
416 | 404 | ||
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index f455905ac9..5cc312a354 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c | |||
@@ -105,12 +105,6 @@ void ata_spindown(int s) | |||
105 | (void)s; | 105 | (void)s; |
106 | } | 106 | } |
107 | 107 | ||
108 | bool simulate_usb(void) | ||
109 | { | ||
110 | usb_screen(); | ||
111 | return false; | ||
112 | } | ||
113 | |||
114 | int rtc_read(int address) | 108 | int rtc_read(int address) |
115 | { | 109 | { |
116 | return address ^ 0x55; | 110 | return address ^ 0x55; |