summaryrefslogtreecommitdiff
path: root/apps/menus/settings_menu.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/menus/settings_menu.c
parentfc4fff0b819a492e57dde76020c5ec78e2f8f6cc (diff)
downloadrockbox-60f581e8f52fa0f7355b80b38fc2d57e78634ae4.tar.gz
rockbox-60f581e8f52fa0f7355b80b38fc2d57e78634ae4.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/menus/settings_menu.c')
-rw-r--r--apps/menus/settings_menu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 9275ff10d6..159ad08a44 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -266,6 +266,9 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
266 &usb_charging, 266 &usb_charging,
267#endif 267#endif
268 ); 268 );
269#ifdef HAVE_USB_POWER
270MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL);
271#endif
269/* Disk */ 272/* Disk */
270#ifdef HAVE_DISK_STORAGE 273#ifdef HAVE_DISK_STORAGE
271MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); 274MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL);
@@ -446,6 +449,8 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
446 449
447#if defined(DX50) || defined(DX90) 450#if defined(DX50) || defined(DX90)
448 &governor, 451 &governor,
452#endif
453#ifdef HAVE_USB_POWER
449 &usb_mode, 454 &usb_mode,
450#endif 455#endif
451 ); 456 );