diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-11-10 01:54:47 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-11-10 01:54:47 +0000 |
commit | 363d2ed77374cf5ba230a3a017e4c9c81f6efbd1 (patch) | |
tree | 1694d6982e50345cff1efc868a4662be84e9b26e /firmware | |
parent | 00ce880da779699d86159ab2eaea2474e9a2b151 (diff) | |
download | rockbox-363d2ed77374cf5ba230a3a017e4c9c81f6efbd1.tar.gz rockbox-363d2ed77374cf5ba230a3a017e4c9c81f6efbd1.zip |
clean up some artifacts left behind from the hxxx move to target tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11490 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 1cdd8995fe..561dc6ee14 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -46,9 +46,6 @@ | |||
46 | 46 | ||
47 | #ifdef TARGET_TREE | 47 | #ifdef TARGET_TREE |
48 | #include "button-target.h" | 48 | #include "button-target.h" |
49 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | ||
50 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
51 | #include "button-target.h" | ||
52 | #endif | 49 | #endif |
53 | 50 | ||
54 | struct event_queue button_queue; | 51 | struct event_queue button_queue; |
@@ -490,19 +487,11 @@ static int button_read(void) | |||
490 | int btn = BUTTON_NONE; | 487 | int btn = BUTTON_NONE; |
491 | int retval; | 488 | int retval; |
492 | #ifndef TARGET_TREE | 489 | #ifndef TARGET_TREE |
493 | #if (CONFIG_KEYPAD != IRIVER_H100_PAD) \ | ||
494 | && (CONFIG_KEYPAD != IRIVER_H300_PAD) | ||
495 | int data; | 490 | int data; |
496 | #endif | 491 | #endif |
497 | #endif | ||
498 | 492 | ||
499 | #ifdef TARGET_TREE | 493 | #ifdef TARGET_TREE |
500 | btn = button_read_device(); | 494 | btn = button_read_device(); |
501 | |||
502 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | ||
503 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
504 | btn = button_read_device(); /* temp untill TARGET_TREE is defined */ | ||
505 | |||
506 | 495 | ||
507 | #elif CONFIG_KEYPAD == RECORDER_PAD | 496 | #elif CONFIG_KEYPAD == RECORDER_PAD |
508 | #ifndef HAVE_FMADC | 497 | #ifndef HAVE_FMADC |