diff options
-rw-r--r-- | apps/bookmark.c | 2 | ||||
-rw-r--r-- | apps/menu.h | 10 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 10 | ||||
-rw-r--r-- | apps/screens.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 9 | ||||
-rw-r--r-- | apps/tree.h | 19 | ||||
-rw-r--r-- | apps/wps.c | 20 |
7 files changed, 66 insertions, 6 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 23ccaefd86..785a8cf2d9 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -670,6 +670,8 @@ static char* select_bookmark(const char* bookmark_file_name) | |||
670 | 670 | ||
671 | #if CONFIG_KEYPAD == ONDIO_PAD | 671 | #if CONFIG_KEYPAD == ONDIO_PAD |
672 | case BUTTON_MENU | BUTTON_RIGHT: | 672 | case BUTTON_MENU | BUTTON_RIGHT: |
673 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
674 | case BUTTON_ON | BUTTON_SELECT: | ||
673 | #else | 675 | #else |
674 | case BUTTON_ON | BUTTON_PLAY: | 676 | case BUTTON_ON | BUTTON_PLAY: |
675 | #endif | 677 | #endif |
diff --git a/apps/menu.h b/apps/menu.h index d7cdfbf6d6..644e0c147b 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -23,7 +23,15 @@ | |||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | 24 | ||
25 | /* button definitions */ | 25 | /* button definitions */ |
26 | #if CONFIG_KEYPAD == RECORDER_PAD | 26 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
27 | #define MENU_NEXT BUTTON_DOWN | ||
28 | #define MENU_PREV BUTTON_UP | ||
29 | #define MENU_EXIT BUTTON_LEFT | ||
30 | #define MENU_EXIT2 BUTTON_OFF | ||
31 | #define MENU_ENTER BUTTON_RIGHT | ||
32 | #define MENU_ENTER2 BUTTON_SELECT | ||
33 | |||
34 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
27 | #define MENU_NEXT BUTTON_DOWN | 35 | #define MENU_NEXT BUTTON_DOWN |
28 | #define MENU_PREV BUTTON_UP | 36 | #define MENU_PREV BUTTON_UP |
29 | #define MENU_EXIT BUTTON_LEFT | 37 | #define MENU_EXIT BUTTON_LEFT |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index e415166e3e..7b954da271 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -34,7 +34,15 @@ | |||
34 | #define KEYBOARD_PAGES 3 | 34 | #define KEYBOARD_PAGES 3 |
35 | 35 | ||
36 | 36 | ||
37 | #if CONFIG_KEYPAD == RECORDER_PAD | 37 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
38 | #define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) | ||
39 | #define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) | ||
40 | #define KBD_SELECT BUTTON_SELECT | ||
41 | #define KBD_PAGE_FLIP BUTTON_MODE | ||
42 | #define KBD_DONE BUTTON_ON | ||
43 | #define KBD_ABORT BUTTON_OFF | ||
44 | #define KBD_BACKSPACE BUTTON_REC | ||
45 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
38 | #define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) | 46 | #define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) |
39 | #define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) | 47 | #define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) |
40 | #define KBD_SELECT BUTTON_PLAY | 48 | #define KBD_SELECT BUTTON_PLAY |
diff --git a/apps/screens.c b/apps/screens.c index 1ec53f6fa1..771cd69c1f 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -1136,7 +1136,7 @@ bool set_time_screen(const char* string, struct tm *tm) | |||
1136 | } | 1136 | } |
1137 | #endif | 1137 | #endif |
1138 | 1138 | ||
1139 | #if CONFIG_KEYPAD == RECORDER_PAD | 1139 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD |
1140 | bool shutdown_screen(void) | 1140 | bool shutdown_screen(void) |
1141 | { | 1141 | { |
1142 | int button; | 1142 | int button; |
diff --git a/apps/settings.h b/apps/settings.h index 05cd5b8126..8d92aa9ad1 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -34,7 +34,14 @@ | |||
34 | #define MAX_FILENAME 20 | 34 | #define MAX_FILENAME 20 |
35 | 35 | ||
36 | /* button definitions */ | 36 | /* button definitions */ |
37 | #if CONFIG_KEYPAD == RECORDER_PAD | 37 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
38 | #define SETTINGS_INC BUTTON_UP | ||
39 | #define SETTINGS_DEC BUTTON_DOWN | ||
40 | #define SETTINGS_OK BUTTON_SELECT | ||
41 | #define SETTINGS_OK2 BUTTON_LEFT | ||
42 | #define SETTINGS_CANCEL BUTTON_OFF | ||
43 | |||
44 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
38 | #define SETTINGS_INC BUTTON_UP | 45 | #define SETTINGS_INC BUTTON_UP |
39 | #define SETTINGS_DEC BUTTON_DOWN | 46 | #define SETTINGS_DEC BUTTON_DOWN |
40 | #define SETTINGS_OK BUTTON_PLAY | 47 | #define SETTINGS_OK BUTTON_PLAY |
diff --git a/apps/tree.h b/apps/tree.h index 880c26af4e..c2606e1fe3 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -21,7 +21,24 @@ | |||
21 | 21 | ||
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | 23 | ||
24 | #if CONFIG_KEYPAD == RECORDER_PAD | 24 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
25 | #define TREE_NEXT BUTTON_DOWN | ||
26 | #define TREE_PREV BUTTON_UP | ||
27 | #define TREE_EXIT BUTTON_LEFT | ||
28 | #define TREE_ENTER BUTTON_RIGHT | ||
29 | #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) | ||
30 | #define TREE_RUN_PRE BUTTON_SELECT | ||
31 | #define TREE_MENU BUTTON_MODE | ||
32 | #define TREE_OFF BUTTON_OFF | ||
33 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) | ||
34 | #define TREE_WPS_PRE BUTTON_ON | ||
35 | #define TREE_PGUP (BUTTON_ON | BUTTON_UP) | ||
36 | #define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) | ||
37 | #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) | ||
38 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) | ||
39 | #define TREE_POWER_BTN BUTTON_ON | ||
40 | |||
41 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
25 | #define TREE_NEXT BUTTON_DOWN | 42 | #define TREE_NEXT BUTTON_DOWN |
26 | #define TREE_PREV BUTTON_UP | 43 | #define TREE_PREV BUTTON_UP |
27 | #define TREE_EXIT BUTTON_LEFT | 44 | #define TREE_EXIT BUTTON_LEFT |
diff --git a/apps/wps.c b/apps/wps.c index f89bdbd840..d3a2733cf6 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -62,7 +62,25 @@ static struct mp3entry* nid3 = NULL; | |||
62 | static char current_track_path[MAX_PATH+1]; | 62 | static char current_track_path[MAX_PATH+1]; |
63 | 63 | ||
64 | /* button definitions */ | 64 | /* button definitions */ |
65 | #if CONFIG_KEYPAD == RECORDER_PAD | 65 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
66 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | ||
67 | #define WPS_NEXT_PRE BUTTON_RIGHT | ||
68 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | ||
69 | #define WPS_PREV_PRE BUTTON_LEFT | ||
70 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) | ||
71 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) | ||
72 | #define WPS_INCVOL BUTTON_UP | ||
73 | #define WPS_DECVOL BUTTON_DOWN | ||
74 | #define WPS_PAUSE BUTTON_ON | ||
75 | #define WPS_MENU (BUTTON_MODE | BUTTON_REL) | ||
76 | #define WPS_MENU_PRE BUTTON_MODE | ||
77 | #define WPS_BROWSE (BUTTON_ON | BUTTON_REL) | ||
78 | #define WPS_BROWSE_PRE BUTTON_ON | ||
79 | #define WPS_EXIT BUTTON_OFF | ||
80 | #define WPS_KEYLOCK (BUTTON_MODE | BUTTON_DOWN) | ||
81 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) | ||
82 | |||
83 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
66 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 84 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
67 | #define WPS_NEXT_PRE BUTTON_RIGHT | 85 | #define WPS_NEXT_PRE BUTTON_RIGHT |
68 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | 86 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) |