summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-02-15 08:50:31 +0000
committerNils Wallménius <nils@rockbox.org>2009-02-15 08:50:31 +0000
commit32d7c6a8631feb85340cf5b0fd8284d282082ca2 (patch)
treee914aaa7ff248ee4f5a125a5fc10f1be92350145
parent1a5ed1b05d1679a0d9f1acc0fda914a11d501dae (diff)
downloadrockbox-32d7c6a8631feb85340cf5b0fd8284d282082ca2.tar.gz
rockbox-32d7c6a8631feb85340cf5b0fd8284d282082ca2.zip
Firewire charger detection for ipod 3G, patch by Boris Gjenero. Fixes FS#9900
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20008 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-ipod3g.h2
-rw-r--r--firmware/target/arm/ipod/power-ipod.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index fad3d3d0fb..0262fbde3f 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -114,7 +114,7 @@
114#define BATTERY_TYPES_COUNT 1 /* only one type */ 114#define BATTERY_TYPES_COUNT 1 /* only one type */
115 115
116/* Hardware controlled charging? FIXME */ 116/* Hardware controlled charging? FIXME */
117//#define CONFIG_CHARGING CHARGING_SIMPLE 117#define CONFIG_CHARGING CHARGING_SIMPLE
118 118
119#ifndef SIMULATOR 119#ifndef SIMULATOR
120 120
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index cb93fe398f..4c6df882c6 100644
--- a/firmware/target/arm/ipod/power-ipod.c
+++ b/firmware/target/arm/ipod/power-ipod.c
@@ -60,6 +60,11 @@ unsigned int power_input_status(void)
60 if ((GPIOC_INPUT_VAL & 0x04) == 0) 60 if ((GPIOC_INPUT_VAL & 0x04) == 0)
61 status = POWER_INPUT_MAIN_CHARGER; 61 status = POWER_INPUT_MAIN_CHARGER;
62 /* */ 62 /* */
63#elif defined(IPOD_3G)
64 /* firewire power */
65 if ((GPIOC_INPUT_VAL & 0x10) == 0)
66 status = POWER_INPUT_MAIN_CHARGER;
67 /* */
63#else 68#else
64 /* This needs filling in for other ipods. */ 69 /* This needs filling in for other ipods. */
65#endif 70#endif