diff options
Diffstat (limited to 'firmware/target/coldfire/iriver')
-rw-r--r-- | firmware/target/coldfire/iriver/h300/power-h300.c | 17 |
1 files changed, 2 insertions, 15 deletions
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) |