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 /firmware/target | |
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 'firmware/target')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | 9 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/power-h300.c | 17 |
3 files changed, 11 insertions, 23 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c index d7fe87f168..4540be671a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | |||
@@ -43,7 +43,7 @@ unsigned int power_input_status(void) | |||
43 | if (GPIO3_DR & (1 << 20)) | 43 | if (GPIO3_DR & (1 << 20)) |
44 | status |= POWER_INPUT_BATTERY; | 44 | status |= POWER_INPUT_BATTERY; |
45 | 45 | ||
46 | if (usb_allowed_current() < 500) | 46 | if (usb_charging_maxcurrent() < 500) |
47 | { | 47 | { |
48 | /* ACK that USB is connected but NOT chargeable */ | 48 | /* ACK that USB is connected but NOT chargeable */ |
49 | status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER); | 49 | status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER); |
@@ -52,6 +52,12 @@ unsigned int power_input_status(void) | |||
52 | return status; | 52 | return status; |
53 | } | 53 | } |
54 | 54 | ||
55 | void usb_charging_maxcurrent_change(int maxcurrent) | ||
56 | { | ||
57 | (void)maxcurrent; | ||
58 | /* Nothing to do */ | ||
59 | } | ||
60 | |||
55 | /* Detect changes in presence of the AC adaptor. */ | 61 | /* Detect changes in presence of the AC adaptor. */ |
56 | void charger_main_detect_event(void) | 62 | void charger_main_detect_event(void) |
57 | { | 63 | { |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c index 5164f0fa1a..a75cb39729 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | |||
@@ -54,15 +54,10 @@ void power_init(void) | |||
54 | #if CONFIG_CHARGING | 54 | #if CONFIG_CHARGING |
55 | 55 | ||
56 | #ifdef HAVE_USB_CHARGING_ENABLE | 56 | #ifdef HAVE_USB_CHARGING_ENABLE |
57 | bool usb_charging_enable(bool on) | 57 | void usb_charging_maxcurrent_change(int maxcurrent) |
58 | { | 58 | { |
59 | bool on = (maxcurrent >= 500); | ||
59 | PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0); | 60 | PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0); |
60 | return on; | ||
61 | } | ||
62 | |||
63 | bool usb_charging_enabled(void) | ||
64 | { | ||
65 | return PDAT11 & 1; | ||
66 | } | 61 | } |
67 | #endif | 62 | #endif |
68 | 63 | ||
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c index 400dc02526..202e1d68ed 100644 --- a/firmware/target/coldfire/iriver/h300/power-h300.c +++ b/firmware/target/coldfire/iriver/h300/power-h300.c | |||
@@ -71,16 +71,14 @@ unsigned int power_input_status(void) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | #ifdef HAVE_USB_POWER | 73 | #ifdef HAVE_USB_POWER |
74 | bool usb_charging_enable(bool on) | 74 | void usb_charging_enable(int state) |
75 | { | 75 | { |
76 | bool rc = false; | 76 | bool on = (state != USB_CHARGING_DISABLE); |
77 | int irqlevel; | 77 | int irqlevel; |
78 | logf("usb_charging_enable(%s)\n", on ? "on" : "off" ); | 78 | logf("usb_charging_enable(%s)\n", on ? "on" : "off" ); |
79 | irqlevel = disable_irq_save(); | 79 | irqlevel = disable_irq_save(); |
80 | pcf50606_set_usb_charging(on); | 80 | pcf50606_set_usb_charging(on); |
81 | rc = on; | ||
82 | restore_irq(irqlevel); | 81 | restore_irq(irqlevel); |
83 | return rc; | ||
84 | } | 82 | } |
85 | #endif /* HAVE_USB_POWER */ | 83 | #endif /* HAVE_USB_POWER */ |
86 | 84 | ||
@@ -92,17 +90,6 @@ bool charging_state(void) | |||
92 | return (GPIO_READ & 0x00800000)?true:false; | 90 | return (GPIO_READ & 0x00800000)?true:false; |
93 | } | 91 | } |
94 | 92 | ||
95 | bool usb_charging_enabled(void) | ||
96 | { | ||
97 | bool rc = false; | ||
98 | /* TODO: read the state of the GPOOD2 register... | ||
99 | * (this also means to set the irq level here) */ | ||
100 | rc = pcf50606_usb_charging_enabled(); | ||
101 | |||
102 | logf("usb charging %s", rc ? "enabled" : "disabled" ); | ||
103 | return rc; | ||
104 | } | ||
105 | |||
106 | void ide_power_enable(bool on) | 93 | void ide_power_enable(bool on) |
107 | { | 94 | { |
108 | if(on) | 95 | if(on) |