summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/ipod
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-12-12 11:41:50 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-12-12 11:41:50 +0000
commit951a519dc4ac82cc05cafa1a3c7c974a72d390f7 (patch)
tree87c2aa3563f816d95119d1d6e3dcd070b916ba26 /firmware/target/arm/ipod
parent675f01ae0b9e3ff59b743264616f5c3956e345cc (diff)
downloadrockbox-951a519dc4ac82cc05cafa1a3c7c974a72d390f7.tar.gz
rockbox-951a519dc4ac82cc05cafa1a3c7c974a72d390f7.tar.bz2
rockbox-951a519dc4ac82cc05cafa1a3c7c974a72d390f7.zip
Fix bug introduced with r28800 (missing interrupt handler).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28806 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r--firmware/target/arm/ipod/button-clickwheel.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index 4dfa4c0a6b..c59458a84b 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -335,7 +335,7 @@ bool headphones_inserted(void)
return (GPIOA_INPUT_VAL & 0x80)?true:false;
}
#else
-void INT_WHEEL(void)
+void INT_SPI(void)
{
int clickwheel_events = WHEELINT;
@@ -380,16 +380,22 @@ void button_init_device(void)
bool button_hold(void)
{
+#if CONFIG_CPU==S5L8701
+ return ((PDAT14 & (1 << 6)) == 0);
+#elif CONFIG_CPU==S5L8702
//TODO: Implement
- //return ((PDAT14 & (1 << 6)) == 0);
return false;
+#endif
}
bool headphones_inserted(void)
{
+#if CONFIG_CPU==S5L8701
+ return ((PDAT14 & (1 << 5)) == 0);
+#elif CONFIG_CPU==S5L8702
//TODO: Implement
- //return ((PDAT14 & (1 << 5)) == 0);
return false;
+#endif
}
#endif