summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2010-06-05 21:00:18 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2010-06-05 21:00:18 +0000
commit055f4c3b6309a35238ea34387fb0b410bbbbb432 (patch)
treef98cc5fcbd4c7cd2a0016af14a4601e2d04ba3fd
parent2eb01425877347f601b1f8b03e07dcb2d690d6d9 (diff)
downloadrockbox-055f4c3b6309a35238ea34387fb0b410bbbbb432.tar.gz
rockbox-055f4c3b6309a35238ea34387fb0b410bbbbb432.zip
New USB charging system, part 3 (end of rework) - Default to usb charging on
It should now be safe to default the USB charging setting to "on" on targets which support it at all - it will only charge when connected to a host which has acknowleged its requirement for 500mA of power. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26595 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings_list.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index ca62e89270..55cefd9bb7 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1548,7 +1548,7 @@ const struct settings_list settings[] = {
1548 TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), 1548 TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"),
1549#endif 1549#endif
1550#ifdef HAVE_USB_CHARGING_ENABLE 1550#ifdef HAVE_USB_CHARGING_ENABLE
1551 CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 0, "usb charging", 1551 CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging",
1552 "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), 1552 "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO),
1553 ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), 1553 ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)),
1554#endif 1554#endif