diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-06-18 21:38:05 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-06-18 21:38:05 +0000 |
commit | 1753e98a700e30aa30d83b458f3bb1b4dacad243 (patch) | |
tree | 7993d09eaf1f1bc6a11c1a78d620e789a201ce2f /apps | |
parent | 3dd7593ac5278549076b63d1d022cb3e7a528e51 (diff) | |
download | rockbox-1753e98a700e30aa30d83b458f3bb1b4dacad243.tar.gz rockbox-1753e98a700e30aa30d83b458f3bb1b4dacad243.zip |
behave the same way with the h300 keypad as with the h100 (for now at least)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6755 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/bookmark.c | 3 | ||||
-rw-r--r-- | apps/settings.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 545e2cf1eb..d2911af39d 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -604,7 +604,8 @@ static int get_bookmark_count(const char* bookmark_file_name) | |||
604 | #define BOOKMARK_SELECT (BUTTON_RIGHT | BUTTON_REL) | 604 | #define BOOKMARK_SELECT (BUTTON_RIGHT | BUTTON_REL) |
605 | #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) | 605 | #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) |
606 | 606 | ||
607 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 607 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
608 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
608 | #define BOOKMARK_SELECT BUTTON_SELECT | 609 | #define BOOKMARK_SELECT BUTTON_SELECT |
609 | #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) | 610 | #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) |
610 | 611 | ||
diff --git a/apps/settings.h b/apps/settings.h index 3e138cfc7e..2d4017c9e3 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -34,7 +34,8 @@ | |||
34 | #define MAX_FILENAME 20 | 34 | #define MAX_FILENAME 20 |
35 | 35 | ||
36 | /* button definitions */ | 36 | /* button definitions */ |
37 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 37 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
38 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
38 | #define SETTINGS_INC BUTTON_UP | 39 | #define SETTINGS_INC BUTTON_UP |
39 | #define SETTINGS_DEC BUTTON_DOWN | 40 | #define SETTINGS_DEC BUTTON_DOWN |
40 | #define SETTINGS_OK BUTTON_SELECT | 41 | #define SETTINGS_OK BUTTON_SELECT |