diff options
author | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-06-05 10:05:27 +0000 |
---|---|---|
committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-06-05 10:05:27 +0000 |
commit | 991e92fd3dc15f1e365761264c26305559ddb0a4 (patch) | |
tree | ac6d18cf1a803c416c0dbc8f61f521444d265ec9 /apps | |
parent | e49464b38735585eaa0ce01f5734c0bcfad851dd (diff) | |
download | rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.tar.gz rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.zip |
New USB charging system, part 1 - API rework and user-visible setting update
1) "Charge during USB connection" option is now tristate: off/on/force. Currently "force" behaves just like "on", but in future it will allow charging even when it was not possible to positively identify a charger.
2) The H300 code has been adjusted to use the new system but there should be no functional differences, it already had the USB charging option and its USB/charging support is hardware controlled.
3) The Gigabeat S code has been adjusted to use the new system: the player now has the USB charging option, which wasn't previously available. The player will only charge at full speed when allowed to do so by a working USB host, so USB AC adapters won't work very well; however, they didn't work before either, so this is not a change in functionality.
4) The iPod Nano 2G code has been adjusted to use the new system: it already had the USB charging option. Using a USB AC adapter won't charge at full speed any more (it did before) - the old implementation was equivalent to the not-yet-implemented "force" option in the new system.
No other target should be affected. Support for the "force" mode and support for at least some other iPod models will come in a future commit :)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26570 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 5 | ||||
-rw-r--r-- | apps/lang/english.lang | 14 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
4 files changed, 18 insertions, 7 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 1288d9acac..f14b7cdcdf 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1556,9 +1556,6 @@ static bool view_battery(void) | |||
1556 | lcd_puts(0, 7, power_message); | 1556 | lcd_puts(0, 7, power_message); |
1557 | lcd_putsf(0, 8, "USB Inserted: %s", | 1557 | lcd_putsf(0, 8, "USB Inserted: %s", |
1558 | usb_inserted() ? "yes" : "no"); | 1558 | usb_inserted() ? "yes" : "no"); |
1559 | #elif defined IRIVER_H300_SERIES | ||
1560 | lcd_putsf(0, 9, "USB Charging Enabled: %s", | ||
1561 | usb_charging_enabled() ? "yes" : "no"); | ||
1562 | #elif defined IPOD_NANO || defined IPOD_VIDEO | 1559 | #elif defined IPOD_NANO || defined IPOD_VIDEO |
1563 | int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; | 1560 | int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; |
1564 | int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; | 1561 | int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; |
@@ -1610,8 +1607,6 @@ static bool view_battery(void) | |||
1610 | (st & POWER_INPUT_MAIN_CHARGER) ? " Main" : "", | 1607 | (st & POWER_INPUT_MAIN_CHARGER) ? " Main" : "", |
1611 | (st & POWER_INPUT_USB_CHARGER) ? " USB" : ""); | 1608 | (st & POWER_INPUT_USB_CHARGER) ? " USB" : ""); |
1612 | 1609 | ||
1613 | lcd_putsf(0, line++, "IUSB Max: %d", usb_allowed_current()); | ||
1614 | |||
1615 | y = ARRAYLEN(chrgstate_strings) - 1; | 1610 | y = ARRAYLEN(chrgstate_strings) - 1; |
1616 | 1611 | ||
1617 | switch (charge_state) | 1612 | switch (charge_state) |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 6cdef29edb..709abbdf75 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13776,3 +13776,17 @@ | |||
13776 | *: "" | 13776 | *: "" |
13777 | </voice> | 13777 | </voice> |
13778 | </phrase> | 13778 | </phrase> |
13779 | <phrase> | ||
13780 | id: LANG_FORCE | ||
13781 | desc: alternative to yes/no for tristate settings | ||
13782 | user: core | ||
13783 | <source> | ||
13784 | *: "Force" | ||
13785 | </source> | ||
13786 | <dest> | ||
13787 | *: "Force" | ||
13788 | </dest> | ||
13789 | <voice> | ||
13790 | *: "Force" | ||
13791 | </voice> | ||
13792 | </phrase> | ||
diff --git a/apps/settings.h b/apps/settings.h index 5c28b4c0a6..3d0ef4c719 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -669,7 +669,7 @@ struct user_settings | |||
669 | bool spdif_enable; /* S/PDIF power on/off */ | 669 | bool spdif_enable; /* S/PDIF power on/off */ |
670 | #endif | 670 | #endif |
671 | #ifdef HAVE_USB_CHARGING_ENABLE | 671 | #ifdef HAVE_USB_CHARGING_ENABLE |
672 | bool usb_charging; | 672 | int usb_charging; |
673 | #endif | 673 | #endif |
674 | 674 | ||
675 | /* device settings */ | 675 | /* device settings */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 1e2b4ebb18..32da25ab89 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1595,7 +1595,9 @@ const struct settings_list settings[] = { | |||
1595 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), | 1595 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), |
1596 | #endif | 1596 | #endif |
1597 | #ifdef HAVE_USB_CHARGING_ENABLE | 1597 | #ifdef HAVE_USB_CHARGING_ENABLE |
1598 | OFFON_SETTING(0,usb_charging,LANG_USB_CHARGING,false,"usb charging",NULL), | 1598 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 0, "usb charging", |
1599 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), | ||
1600 | ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), | ||
1599 | #endif | 1601 | #endif |
1600 | OFFON_SETTING(F_BANFROMQS,cuesheet,LANG_CUESHEET_ENABLE,false,"cuesheet support", | 1602 | OFFON_SETTING(F_BANFROMQS,cuesheet,LANG_CUESHEET_ENABLE,false,"cuesheet support", |
1601 | NULL), | 1603 | NULL), |