summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/ipod
diff options
context:
space:
mode:
authorMichael Sparmann <theseven@rockbox.org>2011-02-10 19:13:30 +0000
committerMichael Sparmann <theseven@rockbox.org>2011-02-10 19:13:30 +0000
commit40e76916cdc644dd5539258896111ba7cb654928 (patch)
tree31312a591770e0c21b74dda22805a8c9db1ad64a /firmware/target/arm/ipod
parentedfff8a5efb1bca75f8b49c3ad3dd151653d39c8 (diff)
downloadrockbox-40e76916cdc644dd5539258896111ba7cb654928.tar.gz
rockbox-40e76916cdc644dd5539258896111ba7cb654928.tar.bz2
rockbox-40e76916cdc644dd5539258896111ba7cb654928.zip
iPod Nano2g/Classic clickwheel: Configure GPIO pins as Hi-Z while hold switch is engaged
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29276 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r--firmware/target/arm/ipod/button-clickwheel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index a22929760c..dd561b2e50 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -389,7 +389,7 @@ bool button_hold(void)
#if CONFIG_CPU==S5L8701
bool value = (PDAT14 & (1 << 6)) == 0;
if (value)
- PCON15 = (PCON15 & ~0xffff0000) | 0x11110000;
+ PCON15 = PCON15 & ~0xffff0000;
else PCON15 = (PCON15 & ~0xffff0000) | 0x22220000;
return value;
#elif CONFIG_CPU==S5L8702
@@ -399,7 +399,7 @@ bool button_hold(void)
holdswitch_last_value = (pmu_read(0x87) & 2) == 0;
}
if (holdswitch_last_value)
- PCON(14) = (PCON(14) & ~0xffffff00) | 0x11111100;
+ PCON(14) = PCON(14) & ~0xffffff00;
else PCON(14) = (PCON(14) & ~0xffffff00) | 0x22222200;
return holdswitch_last_value;
#endif