diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/deutsch.lang | 80 | ||||
-rw-r--r-- | apps/lang/english.lang | 80 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 3 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 1 | ||||
-rw-r--r-- | apps/settings_list.c | 12 |
6 files changed, 178 insertions, 0 deletions
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index 6d9c025bd2..d0e0c92c2c 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang | |||
@@ -13075,3 +13075,83 @@ | |||
13075 | ibassodx90: "Freq Scaling Governor" | 13075 | ibassodx90: "Freq Scaling Governor" |
13076 | </voice> | 13076 | </voice> |
13077 | </phrase> | 13077 | </phrase> |
13078 | <phrase> | ||
13079 | id: LANG_IBASSO_USB_MODE | ||
13080 | desc: in Settings -> General -> System -> USB Mode | ||
13081 | user: core | ||
13082 | <source> | ||
13083 | *: none | ||
13084 | ibassodx50: "USB Mode" | ||
13085 | ibassodx90: "USB Mode" | ||
13086 | </source> | ||
13087 | <dest> | ||
13088 | *: none | ||
13089 | ibassodx50: "USB Modus" | ||
13090 | ibassodx90: "USB Modus" | ||
13091 | </dest> | ||
13092 | <voice> | ||
13093 | *: none | ||
13094 | ibassodx50: "USB Modus" | ||
13095 | ibassodx90: "USB Modus" | ||
13096 | </voice> | ||
13097 | </phrase> | ||
13098 | <phrase> | ||
13099 | id: LANG_IBASSO_USB_MODE_MASS_STORAGE | ||
13100 | desc: in Settings -> General -> System -> USB Mode: Mass Storage | ||
13101 | user: core | ||
13102 | <source> | ||
13103 | *: none | ||
13104 | ibassodx50: "Mass Storage" | ||
13105 | ibassodx90: "Mass Storage" | ||
13106 | </source> | ||
13107 | <dest> | ||
13108 | *: none | ||
13109 | ibassodx50: "Massenspeicher" | ||
13110 | ibassodx90: "Massenspeicher" | ||
13111 | </dest> | ||
13112 | <voice> | ||
13113 | *: none | ||
13114 | ibassodx50: "Massenspeicher" | ||
13115 | ibassodx90: "Massenspeicher" | ||
13116 | </voice> | ||
13117 | </phrase> | ||
13118 | <phrase> | ||
13119 | id: LANG_IBASSO_USB_MODE_CHARGE | ||
13120 | desc: in Settings -> General -> System -> USB Mode: Charge Only | ||
13121 | user: core | ||
13122 | <source> | ||
13123 | *: none | ||
13124 | ibassodx50: "Charge Only" | ||
13125 | ibassodx90: "Charge Only" | ||
13126 | </source> | ||
13127 | <dest> | ||
13128 | *: none | ||
13129 | ibassodx50: "Nur laden" | ||
13130 | ibassodx90: "Nur laden" | ||
13131 | </dest> | ||
13132 | <voice> | ||
13133 | *: none | ||
13134 | ibassodx50: "Nur laden" | ||
13135 | ibassodx90: "Nur laden" | ||
13136 | </voice> | ||
13137 | </phrase> | ||
13138 | <phrase> | ||
13139 | id: LANG_IBASSO_USB_MODE_ADB | ||
13140 | desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge | ||
13141 | user: core | ||
13142 | <source> | ||
13143 | *: none | ||
13144 | ibassodx50: "Android Debug Bridge" | ||
13145 | ibassodx90: "Android Debug Bridge" | ||
13146 | </source> | ||
13147 | <dest> | ||
13148 | *: none | ||
13149 | ibassodx50: "Android Debug Bridge" | ||
13150 | ibassodx90: "Android Debug Bridge" | ||
13151 | </dest> | ||
13152 | <voice> | ||
13153 | *: none | ||
13154 | ibassodx50: "Android Debug Bridge" | ||
13155 | ibassodx90: "Android Debug Bridge" | ||
13156 | </voice> | ||
13157 | </phrase> | ||
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 081e33d32c..67b8d01efc 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13393,3 +13393,83 @@ | |||
13393 | ibassodx90: "Freq Scaling Governor" | 13393 | ibassodx90: "Freq Scaling Governor" |
13394 | </voice> | 13394 | </voice> |
13395 | </phrase> | 13395 | </phrase> |
13396 | <phrase> | ||
13397 | id: LANG_IBASSO_USB_MODE | ||
13398 | desc: in Settings -> General -> System -> USB Mode | ||
13399 | user: core | ||
13400 | <source> | ||
13401 | *: none | ||
13402 | ibassodx50: "USB Mode" | ||
13403 | ibassodx90: "USB Mode" | ||
13404 | </source> | ||
13405 | <dest> | ||
13406 | *: none | ||
13407 | ibassodx50: "USB Mode" | ||
13408 | ibassodx90: "USB Mode" | ||
13409 | </dest> | ||
13410 | <voice> | ||
13411 | *: none | ||
13412 | ibassodx50: "USB Mode" | ||
13413 | ibassodx90: "USB Mode" | ||
13414 | </voice> | ||
13415 | </phrase> | ||
13416 | <phrase> | ||
13417 | id: LANG_IBASSO_USB_MODE_MASS_STORAGE | ||
13418 | desc: in Settings -> General -> System -> USB Mode: Mass Storage | ||
13419 | user: core | ||
13420 | <source> | ||
13421 | *: none | ||
13422 | ibassodx50: "Mass Storage" | ||
13423 | ibassodx90: "Mass Storage" | ||
13424 | </source> | ||
13425 | <dest> | ||
13426 | *: none | ||
13427 | ibassodx50: "Mass Storage" | ||
13428 | ibassodx90: "Mass Storage" | ||
13429 | </dest> | ||
13430 | <voice> | ||
13431 | *: none | ||
13432 | ibassodx50: "Mass Storage" | ||
13433 | ibassodx90: "Mass Storage" | ||
13434 | </voice> | ||
13435 | </phrase> | ||
13436 | <phrase> | ||
13437 | id: LANG_IBASSO_USB_MODE_CHARGE | ||
13438 | desc: in Settings -> General -> System -> USB Mode: Charge Only | ||
13439 | user: core | ||
13440 | <source> | ||
13441 | *: none | ||
13442 | ibassodx50: "Charge Only" | ||
13443 | ibassodx90: "Charge Only" | ||
13444 | </source> | ||
13445 | <dest> | ||
13446 | *: none | ||
13447 | ibassodx50: "Charge Only" | ||
13448 | ibassodx90: "Charge Only" | ||
13449 | </dest> | ||
13450 | <voice> | ||
13451 | *: none | ||
13452 | ibassodx50: "Charge Only" | ||
13453 | ibassodx90: "Charge Only" | ||
13454 | </voice> | ||
13455 | </phrase> | ||
13456 | <phrase> | ||
13457 | id: LANG_IBASSO_USB_MODE_ADB | ||
13458 | desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge | ||
13459 | user: core | ||
13460 | <source> | ||
13461 | *: none | ||
13462 | ibassodx50: "Android Debug Bridge" | ||
13463 | ibassodx90: "Android Debug Bridge" | ||
13464 | </source> | ||
13465 | <dest> | ||
13466 | *: none | ||
13467 | ibassodx50: "Android Debug Bridge" | ||
13468 | ibassodx90: "Android Debug Bridge" | ||
13469 | </dest> | ||
13470 | <voice> | ||
13471 | *: none | ||
13472 | ibassodx50: "Android Debug Bridge" | ||
13473 | ibassodx90: "Android Debug Bridge" | ||
13474 | </voice> | ||
13475 | </phrase> | ||
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 6fcc3e91a9..f42550cc6a 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -52,6 +52,7 @@ | |||
52 | 52 | ||
53 | #if defined(DX50) || defined(DX90) | 53 | #if defined(DX50) || defined(DX90) |
54 | #include "governor-ibasso.h" | 54 | #include "governor-ibasso.h" |
55 | #include "usb-ibasso.h" | ||
55 | #endif | 56 | #endif |
56 | 57 | ||
57 | /***********************************/ | 58 | /***********************************/ |
@@ -331,6 +332,7 @@ MENUITEM_SETTING(shortcuts_replaces_quickscreen, &global_settings.shortcuts_repl | |||
331 | 332 | ||
332 | #if defined(DX50) || defined(DX90) | 333 | #if defined(DX50) || defined(DX90) |
333 | MENUITEM_SETTING(governor, &global_settings.governor, NULL); | 334 | MENUITEM_SETTING(governor, &global_settings.governor, NULL); |
335 | MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL); | ||
334 | #endif | 336 | #endif |
335 | 337 | ||
336 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | 338 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), |
@@ -388,6 +390,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
388 | 390 | ||
389 | #if defined(DX50) || defined(DX90) | 391 | #if defined(DX50) || defined(DX90) |
390 | &governor, | 392 | &governor, |
393 | &usb_mode, | ||
391 | #endif | 394 | #endif |
392 | ); | 395 | ); |
393 | 396 | ||
diff --git a/apps/settings.c b/apps/settings.c index be7b7c30e6..a0e20839ed 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -107,6 +107,7 @@ struct system_status global_status; | |||
107 | 107 | ||
108 | #if defined(DX50) || defined(DX90) | 108 | #if defined(DX50) || defined(DX90) |
109 | #include "governor-ibasso.h" | 109 | #include "governor-ibasso.h" |
110 | #include "usb-ibasso.h" | ||
110 | #endif | 111 | #endif |
111 | 112 | ||
112 | 113 | ||
@@ -1088,6 +1089,7 @@ void settings_apply(bool read_disk) | |||
1088 | 1089 | ||
1089 | #if defined(DX50) || defined(DX90) | 1090 | #if defined(DX50) || defined(DX90) |
1090 | ibasso_set_governor(global_settings.governor); | 1091 | ibasso_set_governor(global_settings.governor); |
1092 | ibasso_set_usb_mode(global_settings.usb_mode); | ||
1091 | #endif | 1093 | #endif |
1092 | 1094 | ||
1093 | /* This should stay last */ | 1095 | /* This should stay last */ |
diff --git a/apps/settings.h b/apps/settings.h index 5d25dc7ab0..ec2d1007eb 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -853,6 +853,7 @@ struct user_settings | |||
853 | 853 | ||
854 | #if defined(DX50) || defined(DX90) | 854 | #if defined(DX50) || defined(DX90) |
855 | int governor; | 855 | int governor; |
856 | int usb_mode; | ||
856 | #endif | 857 | #endif |
857 | }; | 858 | }; |
858 | 859 | ||
diff --git a/apps/settings_list.c b/apps/settings_list.c index 2c3f360cea..62f232610c 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -64,6 +64,7 @@ | |||
64 | 64 | ||
65 | #if defined(DX50) || defined(DX90) | 65 | #if defined(DX50) || defined(DX90) |
66 | #include "governor-ibasso.h" | 66 | #include "governor-ibasso.h" |
67 | #include "usb-ibasso.h" | ||
67 | #endif | 68 | #endif |
68 | 69 | ||
69 | #define NVRAM(bytes) (bytes<<F_NVRAM_MASK_SHIFT) | 70 | #define NVRAM(bytes) (bytes<<F_NVRAM_MASK_SHIFT) |
@@ -2212,6 +2213,17 @@ const struct settings_list settings[] = { | |||
2212 | "Interactive", | 2213 | "Interactive", |
2213 | "Powersave", | 2214 | "Powersave", |
2214 | "Performance"), | 2215 | "Performance"), |
2216 | CHOICE_SETTING(0, | ||
2217 | usb_mode, | ||
2218 | LANG_IBASSO_USB_MODE, | ||
2219 | USB_MODE_MASS_STORAGE, | ||
2220 | "usb mode", | ||
2221 | "mass storage,charge,adb", | ||
2222 | ibasso_set_usb_mode, | ||
2223 | 3, | ||
2224 | ID2P(LANG_IBASSO_USB_MODE_MASS_STORAGE), | ||
2225 | ID2P(LANG_IBASSO_USB_MODE_CHARGE), | ||
2226 | ID2P(LANG_IBASSO_USB_MODE_ADB)), | ||
2215 | #endif | 2227 | #endif |
2216 | }; | 2228 | }; |
2217 | 2229 | ||