summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 fad3d3d..0262fbd 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -114,7 +114,7 @@
#define BATTERY_TYPES_COUNT 1 /* only one type */
/* Hardware controlled charging? FIXME */
-//#define CONFIG_CHARGING CHARGING_SIMPLE
+#define CONFIG_CHARGING CHARGING_SIMPLE
#ifndef SIMULATOR
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index cb93fe3..4c6df88 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)
if ((GPIOC_INPUT_VAL & 0x04) == 0)
status = POWER_INPUT_MAIN_CHARGER;
/* */
+#elif defined(IPOD_3G)
+ /* firewire power */
+ if ((GPIOC_INPUT_VAL & 0x10) == 0)
+ status = POWER_INPUT_MAIN_CHARGER;
+ /* */
#else
/* This needs filling in for other ipods. */
#endif