diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-06-30 10:27:29 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-06-30 10:27:29 +0000 |
| commit | e8e953f5d5c11bed80df12270b6b2abc464abaad (patch) | |
| tree | db8ba08030dde161d1e087b7717829c25f93a882 /firmware | |
| parent | b936d94e41d21b7ac54e58707966121a309eb05b (diff) | |
| download | rockbox-e8e953f5d5c11bed80df12270b6b2abc464abaad.tar.gz rockbox-e8e953f5d5c11bed80df12270b6b2abc464abaad.zip | |
I believe this is more likely to reflect the h300 keypad
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6942 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/drivers/button.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index b2de8b8157..645e8ad8e1 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
| @@ -69,8 +69,7 @@ static void button_tick(void) | |||
| 69 | int diff; | 69 | int diff; |
| 70 | int btn; | 70 | int btn; |
| 71 | 71 | ||
| 72 | #if !defined(HAVE_MMC) && (CONFIG_KEYPAD != IRIVER_H100_PAD) \ | 72 | #if (CONFIG_KEYPAD == PLAYER_PAD) || (CONFIG_KEYPAD == RECORDER_PAD) |
| 73 | && (CONFIG_KEYPAD != GMINI100_PAD) | ||
| 74 | 73 | ||
| 75 | /* Post events for the remote control */ | 74 | /* Post events for the remote control */ |
| 76 | btn = remote_control_rx(); | 75 | btn = remote_control_rx(); |
| @@ -359,7 +358,7 @@ static int button_read(void) | |||
| 359 | 358 | ||
| 360 | int data; | 359 | int data; |
| 361 | 360 | ||
| 362 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 361 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
| 363 | 362 | ||
| 364 | static bool hold_button = false; | 363 | static bool hold_button = false; |
| 365 | static bool remote_hold_button = false; | 364 | static bool remote_hold_button = false; |