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 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