diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config/ipod1g2g.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/ipod/power-ipod.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h index 057b0fab48..fd497c7469 100644 --- a/firmware/export/config/ipod1g2g.h +++ b/firmware/export/config/ipod1g2g.h | |||
@@ -131,8 +131,8 @@ | |||
131 | 131 | ||
132 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE | 132 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE |
133 | 133 | ||
134 | /* Hardware controlled charging? FIXME */ | 134 | /* Hardware controlled charging */ |
135 | //#define CONFIG_CHARGING CHARGING_SIMPLE | 135 | #define CONFIG_CHARGING CHARGING_SIMPLE |
136 | 136 | ||
137 | /* FIXME: Don't shutdown on low battery until we have proper suspend. */ | 137 | /* FIXME: Don't shutdown on low battery until we have proper suspend. */ |
138 | #define NO_LOW_BATTERY_SHUTDOWN | 138 | #define NO_LOW_BATTERY_SHUTDOWN |
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c index ef594173f0..fcaf5b4ff8 100644 --- a/firmware/target/arm/ipod/power-ipod.c +++ b/firmware/target/arm/ipod/power-ipod.c | |||
@@ -66,7 +66,7 @@ unsigned int power_input_status(void) | |||
66 | if ((GPIOD_INPUT_VAL & 0x08) != 0) | 66 | if ((GPIOD_INPUT_VAL & 0x08) != 0) |
67 | status |= POWER_INPUT_USB_CHARGER; | 67 | status |= POWER_INPUT_USB_CHARGER; |
68 | /* */ | 68 | /* */ |
69 | #elif defined(IPOD_3G) | 69 | #elif defined(IPOD_3G) || defined(IPOD_1G2G) |
70 | /* firewire power */ | 70 | /* firewire power */ |
71 | if ((GPIOC_INPUT_VAL & 0x10) == 0) | 71 | if ((GPIOC_INPUT_VAL & 0x10) == 0) |
72 | status = POWER_INPUT_MAIN_CHARGER; | 72 | status = POWER_INPUT_MAIN_CHARGER; |