summaryrefslogtreecommitdiffstats
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-11-02 08:10:15 -0500
committerSolomon Peachy <pizza@shaftnet.org>2020-11-13 16:44:01 -0500
commit60f581e8f52fa0f7355b80b38fc2d57e78634ae4 (patch)
tree4051cf647a687fdf7c58e21010654d87e96a7aa1 /apps/settings_list.c
parentfc4fff0b819a492e57dde76020c5ec78e2f8f6cc (diff)
downloadrockbox-60f581e8f5.tar.gz
rockbox-60f581e8f5.tar.bz2
rockbox-60f581e8f5.zip
usb: Add ability to prompt user about what to do upon usb insertion
v3: Add in config option v4: Bugfixes v5: Force a redraw upon exiting v6: keypress-in-chargeonly mode enables mass storage (and vice versa) v7: Fix bootloader builds v8: Update manual, and have bootloader respect keypresses v9: Change default to mass storage (ie no change in behavior) todo: * test-build dx50/dx90 * Switch from yes/no to proper menu? * prevent WPS progress bar from drawing over us Change-Id: I82e0ccb08497b7a5aa756ce77f1332ee963703a7 ... Change-Id: I7946cf240b18a4fa8ace5e25e1eb6e97b8b12d7c
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c26
1 files changed, 20 insertions, 6 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 47384bdbed..17720b5145 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -2156,17 +2156,31 @@ const struct settings_list settings[] = {
"Interactive",
"Powersave",
"Performance"),
+#endif
+#if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
CHOICE_SETTING(0,
usb_mode,
- LANG_IBASSO_USB_MODE,
+ LANG_USB_MODE,
USB_MODE_MASS_STORAGE,
"usb mode",
- "mass storage,charge,adb",
- ibasso_set_usb_mode,
+ "ask,mass storage,charge"
+#if defined(DX50) || defined(DX90)
+ ",adb"
+#endif
+ ,
+ usb_set_mode,
+#if defined(DX50) || defined(DX90)
+ 4,
+#else
3,
- ID2P(LANG_IBASSO_USB_MODE_MASS_STORAGE),
- ID2P(LANG_IBASSO_USB_MODE_CHARGE),
- ID2P(LANG_IBASSO_USB_MODE_ADB)),
+#endif
+ ID2P(LANG_ASK),
+ ID2P(LANG_USB_MODE_MASS_STORAGE),
+ ID2P(LANG_USB_MODE_CHARGE)
+#if defined(DX50) || defined(DX90)
+ ,ID2P(LANG_USB_MODE_ADB)
+#endif
+ ),
#endif
};