diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-12-12 11:41:50 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-12-12 11:41:50 +0000 |
commit | 951a519dc4ac82cc05cafa1a3c7c974a72d390f7 (patch) | |
tree | 87c2aa3563f816d95119d1d6e3dcd070b916ba26 /firmware/target | |
parent | 675f01ae0b9e3ff59b743264616f5c3956e345cc (diff) | |
download | rockbox-951a519dc4ac82cc05cafa1a3c7c974a72d390f7.tar.gz 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')
-rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 12 |
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) | |||
335 | return (GPIOA_INPUT_VAL & 0x80)?true:false; | 335 | return (GPIOA_INPUT_VAL & 0x80)?true:false; |
336 | } | 336 | } |
337 | #else | 337 | #else |
338 | void INT_WHEEL(void) | 338 | void INT_SPI(void) |
339 | { | 339 | { |
340 | int clickwheel_events = WHEELINT; | 340 | int clickwheel_events = WHEELINT; |
341 | 341 | ||
@@ -380,16 +380,22 @@ void button_init_device(void) | |||
380 | 380 | ||
381 | bool button_hold(void) | 381 | bool button_hold(void) |
382 | { | 382 | { |
383 | #if CONFIG_CPU==S5L8701 | ||
384 | return ((PDAT14 & (1 << 6)) == 0); | ||
385 | #elif CONFIG_CPU==S5L8702 | ||
383 | //TODO: Implement | 386 | //TODO: Implement |
384 | //return ((PDAT14 & (1 << 6)) == 0); | ||
385 | return false; | 387 | return false; |
388 | #endif | ||
386 | } | 389 | } |
387 | 390 | ||
388 | bool headphones_inserted(void) | 391 | bool headphones_inserted(void) |
389 | { | 392 | { |
393 | #if CONFIG_CPU==S5L8701 | ||
394 | return ((PDAT14 & (1 << 5)) == 0); | ||
395 | #elif CONFIG_CPU==S5L8702 | ||
390 | //TODO: Implement | 396 | //TODO: Implement |
391 | //return ((PDAT14 & (1 << 5)) == 0); | ||
392 | return false; | 397 | return false; |
398 | #endif | ||
393 | } | 399 | } |
394 | #endif | 400 | #endif |
395 | 401 | ||