From 32d7c6a8631feb85340cf5b0fd8284d282082ca2 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sun, 15 Feb 2009 08:50:31 +0000 Subject: 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 --- firmware/export/config-ipod3g.h | 2 +- firmware/target/arm/ipod/power-ipod.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 @@ #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 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) 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 -- cgit v1.2.3