diff options
| author | Michael Giacomelli <giac2000@hotmail.com> | 2008-05-03 21:15:13 +0000 |
|---|---|---|
| committer | Michael Giacomelli <giac2000@hotmail.com> | 2008-05-03 21:15:13 +0000 |
| commit | e243db65b41c967ae8e7ef4cd946a2cdf7c6a19e (patch) | |
| tree | 48dd8c03631536feab12c7e3386bc832bbfbd269 /firmware/target/arm/ipod/button-1g-3g.c | |
| parent | 9e6cd921a162c96e3fb72e8909d91181c7d2b531 (diff) | |
Commit FS#8920, fixed headphone detection for the Ipod 2G by Mark Fawcus.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17336 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/ipod/button-1g-3g.c')
| -rw-r--r-- | firmware/target/arm/ipod/button-1g-3g.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c index be02f873bb..2aa65bb2c0 100644 --- a/firmware/target/arm/ipod/button-1g-3g.c +++ b/firmware/target/arm/ipod/button-1g-3g.c @@ -250,5 +250,21 @@ bool button_hold(void) bool headphones_inserted(void) { +#ifdef IPOD_1G2G + if ((IPOD_HW_REVISION >> 16) == 2) + { + /* 2G uses GPIO B bit 0 */ + return (GPIOB_INPUT_VAL & 0x1)?true:false; + } + else + { + /* 1G has no headphone detection, so fake insertion */ + return (true); + } +#else + /* 3G uses GPIO C bit 0 */ return (GPIOC_INPUT_VAL & 0x1)?true:false; +#endif } + + |