summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-06-30 10:27:29 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-06-30 10:27:29 +0000
commite8e953f5d5c11bed80df12270b6b2abc464abaad (patch)
treedb8ba08030dde161d1e087b7717829c25f93a882
parentb936d94e41d21b7ac54e58707966121a309eb05b (diff)
downloadrockbox-e8e953f5d5c11bed80df12270b6b2abc464abaad.zip
rockbox-e8e953f5d5c11bed80df12270b6b2abc464abaad.tar.gz
rockbox-e8e953f5d5c11bed80df12270b6b2abc464abaad.tar.bz2
rockbox-e8e953f5d5c11bed80df12270b6b2abc464abaad.tar.xz
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
-rw-r--r--firmware/drivers/button.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index b2de8b8..645e8ad 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -69,8 +69,7 @@ static void button_tick(void)
int diff;
int btn;
-#if !defined(HAVE_MMC) && (CONFIG_KEYPAD != IRIVER_H100_PAD) \
- && (CONFIG_KEYPAD != GMINI100_PAD)
+#if (CONFIG_KEYPAD == PLAYER_PAD) || (CONFIG_KEYPAD == RECORDER_PAD)
/* Post events for the remote control */
btn = remote_control_rx();
@@ -359,7 +358,7 @@ static int button_read(void)
int data;
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
static bool hold_button = false;
static bool remote_hold_button = false;