diff options
| author | Brandon Low <lostlogic@rockbox.org> | 2006-01-27 01:19:14 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@rockbox.org> | 2006-01-27 01:19:14 +0000 |
| commit | 005c2f8026b227c1343157828b9e2a078cc7594d (patch) | |
| tree | b76189a8a098762d015cd1f33d6907bdefc799ca | |
| parent | 3325d9915451bac9554217fce9e4d3c7529d91e2 (diff) | |
| download | rockbox-005c2f8026b227c1343157828b9e2a078cc7594d.tar.gz rockbox-005c2f8026b227c1343157828b9e2a078cc7594d.zip | |
Detect USB charge state in Hxx0
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8462 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/power.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index b5d4d7d22a..c3f2d82db4 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include "logf.h" | 27 | #include "logf.h" |
| 28 | #include "pcf50605.h" | 28 | #include "pcf50605.h" |
| 29 | #include "pcf50606.h" | 29 | #include "pcf50606.h" |
| 30 | #include "usb.h" | ||
| 30 | 31 | ||
| 31 | #ifdef HAVE_CHARGE_CTRL | 32 | #ifdef HAVE_CHARGE_CTRL |
| 32 | bool charger_enabled; | 33 | bool charger_enabled; |
| @@ -108,7 +109,7 @@ void power_init(void) | |||
| 108 | bool charger_inserted(void) | 109 | bool charger_inserted(void) |
| 109 | { | 110 | { |
| 110 | #if CONFIG_CPU == MCF5249 | 111 | #if CONFIG_CPU == MCF5249 |
| 111 | return (GPIO1_READ & 0x00400000)?true:false; | 112 | return (GPIO1_READ & 0x00400000) || usb_powered(); |
| 112 | #elif defined(GMINI_ARCH) | 113 | #elif defined(GMINI_ARCH) |
| 113 | return (P7 & 0x80) == 0; | 114 | return (P7 & 0x80) == 0; |
| 114 | #elif defined(HAVE_CHARGE_CTRL) | 115 | #elif defined(HAVE_CHARGE_CTRL) |