diff options
author | Mark Arigo <markarigo@gmail.com> | 2008-02-24 04:12:16 +0000 |
---|---|---|
committer | Mark Arigo <markarigo@gmail.com> | 2008-02-24 04:12:16 +0000 |
commit | d829075a0003fd5a976d5e2303b0317d3dc63ea8 (patch) | |
tree | fd5838c65cedc6d2b889ba1a332f99e53553ca7c /apps | |
parent | f928c8f0f854a91323b19357021bcaef9a7cc27e (diff) | |
download | rockbox-d829075a0003fd5a976d5e2303b0317d3dc63ea8.tar.gz rockbox-d829075a0003fd5a976d5e2303b0317d3dc63ea8.zip |
Driver for the Synaptics touchpad on the m:robe 100 based on the 3-wire interface spec. Needs some tweaking as it's too sensitive with the default hardware settings. For now, the vertical strip is divided into up/select/down buttons. Also, redo the keymap (using the Gigabeat as a starting point), but it still needs a good bit of work.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16400 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 6 | ||||
-rw-r--r-- | apps/keymaps/keymap-mr100.c | 534 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 35 |
3 files changed, 282 insertions, 293 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index d1463c7353..8cd1fedf5b 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -987,10 +987,12 @@ static bool dbg_spdif(void) | |||
987 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 987 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
988 | # define DEBUG_CANCEL BUTTON_REC | 988 | # define DEBUG_CANCEL BUTTON_REC |
989 | 989 | ||
990 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) || \ | 990 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
991 | (CONFIG_KEYPAD == MROBE100_PAD) | ||
992 | # define DEBUG_CANCEL BUTTON_REW | 991 | # define DEBUG_CANCEL BUTTON_REW |
993 | 992 | ||
993 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | ||
994 | # define DEBUG_CANCEL BUTTON_MENU | ||
995 | |||
994 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 996 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
995 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 997 | (CONFIG_KEYPAD == SANSA_C200_PAD) |
996 | # define DEBUG_CANCEL BUTTON_LEFT | 998 | # define DEBUG_CANCEL BUTTON_LEFT |
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index 572f510fb9..2d6b616d5d 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) Barry Wardell 2006 | 10 | * Copyright (C) 2008 Mark Arigo |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -17,331 +17,314 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | /* Button Code Definitions for Olympus m:robe 100 target | 20 | /* Button Code Definitions for the Olympus m:robe 100 */ |
21 | NOTE: COPIED FROM IRIVER H10, NEEDS ADAPTING TO MROBE 100 */ | 21 | #include <stdio.h> |
22 | #include <string.h> | ||
23 | #include <stdlib.h> | ||
22 | 24 | ||
23 | #include "config.h" | 25 | #include "config.h" |
24 | #include "action.h" | 26 | #include "action.h" |
25 | #include "button.h" | 27 | #include "button.h" |
26 | #include "settings.h" | 28 | #include "settings.h" |
27 | 29 | ||
28 | /* {Action Code, Button code, Prereq button code } */ | 30 | /* |
29 | |||
30 | /* | ||
31 | * The format of the list is as follows | 31 | * The format of the list is as follows |
32 | * { Action Code, Button code, Prereq button code } | 32 | * { Action Code, Button code, Prereq button code } |
33 | * if there's no need to check the previous button's value, use BUTTON_NONE | 33 | * if there's no need to check the previous button's value, use BUTTON_NONE |
34 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 34 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
35 | */ | 35 | */ |
36 | |||
37 | /* CONTEXT_CUSTOM's used in this file... | ||
38 | |||
39 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) | ||
40 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens | ||
41 | i.e where up/down is inc/dec | ||
42 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec | ||
43 | |||
44 | */ | ||
45 | |||
46 | |||
36 | static const struct button_mapping button_context_standard[] = { | 47 | static const struct button_mapping button_context_standard[] = { |
37 | { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, | 48 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
38 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 49 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
39 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 50 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
40 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 51 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
41 | |||
42 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
43 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
44 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
45 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
46 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
47 | |||
48 | /* TODO: this is a bit of a hack so that we can exit some debug screens | ||
49 | * (audio, tagcache, dircache, hwinfo, stack, ports). They don't like it | ||
50 | * when ACTION_STD_CANCEL has anything other than BUTTON_NONE for prereq. | ||
51 | */ | ||
52 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, | ||
53 | 52 | ||
54 | LAST_ITEM_IN_LIST | 53 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
55 | }; /* button_context_standard */ | 54 | { ACTION_STD_CANCEL, BUTTON_DISPLAY, BUTTON_NONE }, |
55 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
56 | 56 | ||
57 | static const struct button_mapping remote_button_context_standard[] = { | 57 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, |
58 | { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 58 | |
59 | { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 59 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
60 | { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 60 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
61 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 61 | |
62 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
63 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | ||
62 | 64 | ||
63 | LAST_ITEM_IN_LIST | 65 | LAST_ITEM_IN_LIST |
64 | }; /* remote_button_context_standard */ | 66 | }; /* button_context_standard */ |
67 | |||
65 | 68 | ||
66 | static const struct button_mapping button_context_wps[] = { | 69 | static const struct button_mapping button_context_wps[] = { |
67 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 70 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
68 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY }, | 71 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
69 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW}, | ||
70 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
71 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, | ||
72 | { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, | ||
73 | { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
74 | { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_REPEAT }, | ||
75 | |||
76 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_FF, BUTTON_POWER }, | ||
77 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_REW, BUTTON_POWER }, | ||
78 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER }, | ||
79 | |||
80 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
81 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, | ||
82 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, | ||
83 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
84 | |||
85 | { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
86 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
87 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
88 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
89 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | ||
90 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | ||
91 | |||
92 | LAST_ITEM_IN_LIST | ||
93 | }; /* button_context_wps */ | ||
94 | 72 | ||
95 | static const struct button_mapping remote_button_context_wps[] = { | 73 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
96 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | 74 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
97 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY }, | ||
98 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW}, | ||
99 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
100 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | ||
101 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
102 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
103 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | ||
104 | |||
105 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
106 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
107 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
108 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
109 | 75 | ||
110 | { ACTION_WPS_PITCHSCREEN, BUTTON_RC_PLAY|BUTTON_LEFT, BUTTON_RC_PLAY }, | 76 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
111 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_PLAY|BUTTON_RIGHT, BUTTON_RC_PLAY }, | 77 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
112 | 78 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | |
113 | LAST_ITEM_IN_LIST | 79 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
114 | }; /* remote_button_context_wps */ | ||
115 | |||
116 | static const struct button_mapping button_context_settings[] = { | ||
117 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, | ||
118 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
119 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
120 | { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
121 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
122 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
123 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
124 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
125 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | ||
126 | |||
127 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | ||
128 | }; /* button_context_settings */ | ||
129 | 80 | ||
130 | static const struct button_mapping button_context_list[] = { | 81 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
131 | { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 82 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
132 | { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REL, BUTTON_FF }, | 83 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
84 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | ||
133 | 85 | ||
134 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 86 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
135 | }; /* button_context_list */ | 87 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
88 | |||
89 | { ACTION_WPS_BROWSE, BUTTON_DISPLAY|BUTTON_REL, BUTTON_DISPLAY }, | ||
90 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_DISPLAY|BUTTON_RIGHT, BUTTON_NONE }, | ||
91 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_NONE }, | ||
92 | { ACTION_WPS_ABRESET, BUTTON_DISPLAY|BUTTON_SELECT, BUTTON_NONE }, | ||
93 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, | ||
94 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, | ||
95 | { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, | ||
136 | 96 | ||
137 | static const struct button_mapping remote_button_context_list[] = { | 97 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
138 | { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, | ||
139 | { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
140 | 98 | ||
99 | LAST_ITEM_IN_LIST | ||
100 | }; /* button_context_wps */ | ||
101 | |||
102 | static const struct button_mapping button_context_list[] = { | ||
103 | { ACTION_LISTTREE_PGUP, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, | ||
104 | { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_DISPLAY|BUTTON_UP }, | ||
105 | { ACTION_LISTTREE_PGUP, BUTTON_DISPLAY|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
106 | { ACTION_LISTTREE_PGDOWN, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, | ||
107 | { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DISPLAY|BUTTON_DOWN }, | ||
108 | { ACTION_LISTTREE_PGDOWN, BUTTON_DISPLAY|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
109 | |||
141 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 110 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
142 | }; /* button_context_list */ | 111 | }; /* button_context_list */ |
143 | 112 | ||
144 | static const struct button_mapping button_context_tree[] = { | 113 | static const struct button_mapping button_context_tree[] = { |
145 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 114 | { ACTION_TREE_WPS, BUTTON_DISPLAY|BUTTON_REL, BUTTON_DISPLAY }, |
146 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 115 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
147 | 116 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | |
148 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 117 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
149 | }; /* button_context_tree */ | 118 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
150 | 119 | ||
151 | static const struct button_mapping remote_button_context_tree[] = { | 120 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
152 | { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
153 | { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
154 | |||
155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | ||
156 | }; /* button_context_tree */ | 121 | }; /* button_context_tree */ |
157 | 122 | ||
158 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 123 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
159 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 124 | { ACTION_NONE, BUTTON_DISPLAY, BUTTON_NONE }, |
160 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 125 | { ACTION_TREE_PGLEFT, BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_DISPLAY }, |
161 | { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, | 126 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_DISPLAY|BUTTON_LEFT }, |
162 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 127 | { ACTION_TREE_PGLEFT, BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_LEFT|BUTTON_REL }, |
163 | }; /* button_context_listtree_scroll_without_combo */ | 128 | { ACTION_TREE_ROOT_INIT, BUTTON_DISPLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_DISPLAY|BUTTON_LEFT }, |
129 | { ACTION_TREE_PGLEFT, BUTTON_DISPLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
130 | { ACTION_TREE_PGRIGHT, BUTTON_DISPLAY|BUTTON_RIGHT, BUTTON_DISPLAY }, | ||
131 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_DISPLAY|BUTTON_RIGHT }, | ||
132 | { ACTION_TREE_PGRIGHT, BUTTON_DISPLAY|BUTTON_RIGHT, BUTTON_RIGHT|BUTTON_REL }, | ||
133 | { ACTION_TREE_PGRIGHT, BUTTON_DISPLAY|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
164 | 134 | ||
165 | static const struct button_mapping remote_button_context_listtree_scroll_without_combo[] = { | ||
166 | { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, | ||
167 | { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
168 | { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
169 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
170 | }; /* button_context_listtree_scroll_without_combo */ | 136 | }; |
171 | 137 | ||
172 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 138 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
173 | { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 139 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
174 | { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF }, | 140 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
175 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_PLAY }, | 141 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
176 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_PLAY }, | 142 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
177 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_REW|BUTTON_REL }, | 143 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
178 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_REW|BUTTON_PLAY }, | 144 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, |
179 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 145 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
180 | { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_PLAY, BUTTON_PLAY }, | 146 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
181 | { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_PLAY }, | 147 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
182 | { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_PLAY, BUTTON_FF|BUTTON_REL }, | ||
183 | { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
184 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | ||
185 | }; /* button_context_listtree_scroll_with_combo */ | ||
186 | |||
187 | static const struct button_mapping remote_button_context_listtree_scroll_with_combo[] = { | ||
188 | { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, | ||
189 | { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, | ||
190 | { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_PLAY }, | ||
191 | { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_RC_PLAY }, | ||
192 | { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_REW|BUTTON_REL }, | ||
193 | { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_REW|BUTTON_RC_PLAY }, | ||
194 | { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
195 | { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_RC_PLAY, BUTTON_RC_PLAY }, | ||
196 | { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_RC_PLAY }, | ||
197 | { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_RC_PLAY, BUTTON_RC_FF|BUTTON_REL }, | ||
198 | { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
199 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 148 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
200 | }; /* button_context_listtree_scroll_with_combo */ | 149 | }; |
150 | |||
151 | static const struct button_mapping button_context_settings[] = { | ||
152 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | ||
153 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
154 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | ||
155 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
156 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
157 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
158 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
159 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
160 | { ACTION_SETTINGS_RESET, BUTTON_DISPLAY, BUTTON_NONE }, | ||
161 | |||
162 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
163 | }; /* button_context_settings */ | ||
164 | |||
165 | static const struct button_mapping button_context_settings_right_is_inc[] = { | ||
166 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | ||
167 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
168 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | ||
169 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
170 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | ||
171 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
172 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | ||
173 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
174 | { ACTION_SETTINGS_RESET, BUTTON_DISPLAY, BUTTON_NONE }, | ||
175 | |||
176 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
177 | }; /* button_context_settingsgraphical */ | ||
201 | 178 | ||
202 | static const struct button_mapping button_context_yesno[] = { | 179 | static const struct button_mapping button_context_yesno[] = { |
203 | { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, | 180 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
204 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 181 | |
182 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
205 | }; /* button_context_settings_yesno */ | 183 | }; /* button_context_settings_yesno */ |
206 | 184 | ||
207 | static const struct button_mapping button_context_quickscreen[] = { | 185 | static const struct button_mapping button_context_colorchooser[] = { |
208 | { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, | 186 | { ACTION_STD_OK, BUTTON_DISPLAY|BUTTON_REL, BUTTON_NONE }, |
209 | { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
210 | { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
211 | { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
212 | { ACTION_QS_LEFT, BUTTON_REW, BUTTON_NONE }, | ||
213 | { ACTION_QS_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
214 | { ACTION_QS_RIGHT, BUTTON_FF, BUTTON_NONE }, | ||
215 | { ACTION_QS_RIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
216 | |||
217 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | ||
218 | }; /* button_context_quickscreen */ | ||
219 | 187 | ||
220 | static const struct button_mapping remote_button_context_quickscreen[] = { | 188 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
221 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 189 | }; /* button_context_colorchooser */ |
222 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
223 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
224 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
225 | { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, | ||
226 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
227 | { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, | ||
228 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
229 | |||
230 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | ||
231 | }; /* button_context_quickscreen */ | ||
232 | 190 | ||
233 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 191 | static const struct button_mapping button_context_eq[] = { |
234 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, | 192 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, |
235 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
236 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
237 | { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, | ||
238 | { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE }, | ||
239 | { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
240 | { ACTION_STD_NEXT, BUTTON_FF, BUTTON_NONE }, | ||
241 | { ACTION_STD_NEXTREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
242 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | ||
243 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | ||
244 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
245 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | ||
246 | 193 | ||
247 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 194 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
248 | }; /* button_context_settings_right_is_inc */ | 195 | }; /* button_context_eq */ |
196 | |||
197 | /** Bookmark Screen **/ | ||
198 | static const struct button_mapping button_context_bmark[] = { | ||
199 | { ACTION_BMS_DELETE, BUTTON_DISPLAY, BUTTON_NONE }, | ||
200 | |||
201 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | ||
202 | }; /* button_context_bmark */ | ||
203 | |||
204 | static const struct button_mapping button_context_time[] = { | ||
205 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
206 | { ACTION_STD_OK, BUTTON_DISPLAY, BUTTON_NONE }, | ||
207 | |||
208 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | ||
209 | }; /* button_context_time */ | ||
210 | |||
211 | static const struct button_mapping button_context_quickscreen[] = { | ||
212 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, | ||
213 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
214 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
215 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
216 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
217 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
218 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
219 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
220 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | ||
221 | |||
222 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
223 | }; /* button_context_quickscreen */ | ||
249 | 224 | ||
250 | static const struct button_mapping button_context_pitchscreen[] = { | 225 | static const struct button_mapping button_context_pitchscreen[] = { |
251 | { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, | 226 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
252 | { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 227 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
253 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 228 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
254 | { ACTION_PS_DEC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 229 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
255 | { ACTION_PS_NUDGE_LEFT, BUTTON_REW, BUTTON_NONE }, | 230 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
256 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 231 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
257 | { ACTION_PS_NUDGE_RIGHT, BUTTON_FF, BUTTON_NONE }, | 232 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
258 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_FF|BUTTON_REL, BUTTON_NONE }, | 233 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
259 | { ACTION_PS_TOGGLE_MODE, BUTTON_POWER, BUTTON_NONE }, | 234 | { ACTION_PS_TOGGLE_MODE, BUTTON_SELECT, BUTTON_NONE }, |
260 | { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 235 | { ACTION_PS_RESET, BUTTON_DISPLAY, BUTTON_NONE }, |
261 | { ACTION_PS_EXIT, BUTTON_LEFT, BUTTON_NONE }, | 236 | { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE }, |
262 | 237 | ||
263 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 238 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
264 | }; /* button_context_pitchscreen */ | 239 | }; /* button_context_pitchcreen */ |
265 | |||
266 | static const struct button_mapping remote_button_context_pitchscreen[] = { | ||
267 | { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
268 | { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
269 | { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
270 | { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
271 | { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE }, | ||
272 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE }, | ||
273 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, | ||
274 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE }, | ||
275 | { ACTION_PS_RESET, BUTTON_RC_PLAY, BUTTON_NONE }, | ||
276 | |||
277 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | ||
278 | }; /* button_context_pitchscreen */ | ||
279 | 240 | ||
280 | static const struct button_mapping button_context_keyboard[] = { | 241 | static const struct button_mapping button_context_keyboard[] = { |
281 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 242 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
282 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 243 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
283 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 244 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
284 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 245 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
285 | { ACTION_KBD_SELECT, BUTTON_REW, BUTTON_NONE }, | 246 | { ACTION_KBD_CURSOR_LEFT, BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_NONE }, |
286 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 247 | { ACTION_KBD_CURSOR_LEFT, BUTTON_DISPLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
287 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, | 248 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_DISPLAY|BUTTON_RIGHT, BUTTON_NONE }, |
288 | { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE }, | 249 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_DISPLAY|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
289 | { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 250 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
290 | { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 251 | { ACTION_KBD_PAGE_FLIP, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, |
291 | { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 252 | { ACTION_KBD_DONE, BUTTON_DISPLAY|BUTTON_REL, BUTTON_DISPLAY }, |
292 | { ACTION_KBD_MORSE_INPUT, BUTTON_REW|BUTTON_PLAY, BUTTON_NONE }, | 253 | { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
293 | { ACTION_KBD_MORSE_SELECT, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 254 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, |
255 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
256 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | ||
257 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
258 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
259 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
260 | { ACTION_KBD_MORSE_INPUT, BUTTON_DISPLAY|BUTTON_POWER, BUTTON_NONE }, | ||
261 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
294 | 262 | ||
295 | LAST_ITEM_IN_LIST | 263 | LAST_ITEM_IN_LIST |
296 | }; /* button_context_keyboard */ | 264 | }; /* button_context_keyboard */ |
297 | 265 | ||
298 | static const struct button_mapping button_context_bmark[] = { | 266 | /***************************************************************************** |
299 | { ACTION_BMS_DELETE, BUTTON_REW, BUTTON_NONE }, | 267 | * Remote control mappings |
300 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 268 | *****************************************************************************/ |
301 | }; /* button_context_bmark */ | ||
302 | 269 | ||
303 | const struct button_mapping button_context_recscreen[] = { | 270 | static const struct button_mapping remote_button_context_standard[] = { |
304 | { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, | 271 | { ACTION_STD_PREV, BUTTON_RC_PLAY, BUTTON_NONE }, |
305 | 272 | { ACTION_STD_PREVREPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | |
306 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 273 | { ACTION_STD_NEXT, BUTTON_RC_DISPLAY, BUTTON_NONE }, |
307 | }; /* button_context_recscreen */ | 274 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_DISPLAY|BUTTON_REPEAT,BUTTON_NONE }, |
275 | { ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE }, | ||
276 | { ACTION_STD_OK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
277 | { ACTION_STD_CONTEXT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, | ||
278 | { ACTION_STD_MENU, BUTTON_RC_FAV, BUTTON_NONE }, | ||
279 | |||
280 | LAST_ITEM_IN_LIST | ||
281 | }; | ||
282 | |||
283 | static const struct button_mapping remote_button_context_wps[] = { | ||
284 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | ||
285 | |||
286 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
287 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, | ||
288 | |||
289 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
290 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
291 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | ||
292 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | ||
293 | |||
294 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
295 | { ACTION_WPS_MENU, BUTTON_RC_FAV, BUTTON_NONE }, | ||
296 | |||
297 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
298 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
299 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
300 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
301 | |||
302 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
303 | }; | ||
304 | |||
305 | static const struct button_mapping remote_button_context_tree[] = { | ||
306 | { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
307 | { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
308 | { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
309 | |||
310 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
311 | }; | ||
308 | 312 | ||
309 | static const struct button_mapping* get_context_mapping_remote( int context ) | 313 | static const struct button_mapping* get_context_mapping_remote( int context ) |
310 | { | 314 | { |
311 | context ^= CONTEXT_REMOTE; | 315 | context ^= CONTEXT_REMOTE; |
312 | 316 | ||
313 | switch (context) | 317 | switch (context) |
314 | { | 318 | { |
315 | case CONTEXT_STD: | ||
316 | case CONTEXT_MAINMENU: | ||
317 | return remote_button_context_standard; | ||
318 | |||
319 | case CONTEXT_WPS: | 319 | case CONTEXT_WPS: |
320 | return remote_button_context_wps; | 320 | return remote_button_context_wps; |
321 | 321 | case CONTEXT_MAINMENU: | |
322 | case CONTEXT_LIST: | ||
323 | return remote_button_context_list; | ||
324 | case CONTEXT_TREE: | 322 | case CONTEXT_TREE: |
325 | if (global_settings.hold_lr_for_scroll_in_list) | ||
326 | return remote_button_context_listtree_scroll_without_combo; | ||
327 | else | ||
328 | return remote_button_context_listtree_scroll_with_combo; | ||
329 | case CONTEXT_CUSTOM|CONTEXT_TREE: | ||
330 | return remote_button_context_tree; | 323 | return remote_button_context_tree; |
331 | |||
332 | case CONTEXT_QUICKSCREEN: | ||
333 | return remote_button_context_quickscreen; | ||
334 | case CONTEXT_PITCHSCREEN: | ||
335 | return remote_button_context_pitchscreen; | ||
336 | case CONTEXT_RECSCREEN: | ||
337 | return button_context_recscreen; | ||
338 | |||
339 | default: | ||
340 | return remote_button_context_standard; | ||
341 | } | 324 | } |
325 | return remote_button_context_standard; | ||
342 | } | 326 | } |
343 | 327 | ||
344 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | ||
345 | const struct button_mapping* get_context_mapping(int context) | 328 | const struct button_mapping* get_context_mapping(int context) |
346 | { | 329 | { |
347 | if (context&CONTEXT_REMOTE) | 330 | if (context&CONTEXT_REMOTE) |
@@ -351,17 +334,16 @@ const struct button_mapping* get_context_mapping(int context) | |||
351 | { | 334 | { |
352 | case CONTEXT_STD: | 335 | case CONTEXT_STD: |
353 | return button_context_standard; | 336 | return button_context_standard; |
354 | |||
355 | case CONTEXT_WPS: | 337 | case CONTEXT_WPS: |
356 | return button_context_wps; | 338 | return button_context_wps; |
357 | 339 | ||
358 | case CONTEXT_LIST: | 340 | case CONTEXT_LIST: |
359 | return button_context_list; | 341 | return button_context_list; |
360 | case CONTEXT_TREE: | ||
361 | case CONTEXT_MAINMENU: | 342 | case CONTEXT_MAINMENU: |
343 | case CONTEXT_TREE: | ||
362 | if (global_settings.hold_lr_for_scroll_in_list) | 344 | if (global_settings.hold_lr_for_scroll_in_list) |
363 | return button_context_listtree_scroll_without_combo; | 345 | return button_context_listtree_scroll_without_combo; |
364 | else | 346 | else |
365 | return button_context_listtree_scroll_with_combo; | 347 | return button_context_listtree_scroll_with_combo; |
366 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 348 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
367 | return button_context_tree; | 349 | return button_context_tree; |
@@ -369,13 +351,18 @@ const struct button_mapping* get_context_mapping(int context) | |||
369 | case CONTEXT_SETTINGS: | 351 | case CONTEXT_SETTINGS: |
370 | return button_context_settings; | 352 | return button_context_settings; |
371 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | 353 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: |
354 | return button_context_settings_right_is_inc; | ||
355 | |||
372 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 356 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
357 | return button_context_colorchooser; | ||
373 | case CONTEXT_SETTINGS_EQ: | 358 | case CONTEXT_SETTINGS_EQ: |
359 | return button_context_eq; | ||
360 | |||
374 | case CONTEXT_SETTINGS_TIME: | 361 | case CONTEXT_SETTINGS_TIME: |
375 | return button_context_settings_right_is_inc; | 362 | return button_context_time; |
376 | 363 | ||
377 | case CONTEXT_YESNOSCREEN: | 364 | case CONTEXT_YESNOSCREEN: |
378 | return button_context_yesno; | 365 | return button_context_yesno; |
379 | case CONTEXT_BOOKMARKSCREEN: | 366 | case CONTEXT_BOOKMARKSCREEN: |
380 | return button_context_bmark; | 367 | return button_context_bmark; |
381 | case CONTEXT_QUICKSCREEN: | 368 | case CONTEXT_QUICKSCREEN: |
@@ -384,11 +371,6 @@ const struct button_mapping* get_context_mapping(int context) | |||
384 | return button_context_pitchscreen; | 371 | return button_context_pitchscreen; |
385 | case CONTEXT_KEYBOARD: | 372 | case CONTEXT_KEYBOARD: |
386 | return button_context_keyboard; | 373 | return button_context_keyboard; |
387 | case CONTEXT_RECSCREEN: | 374 | } |
388 | return button_context_recscreen; | ||
389 | |||
390 | default: | ||
391 | return button_context_standard; | ||
392 | } | ||
393 | return button_context_standard; | 375 | return button_context_standard; |
394 | } | 376 | } |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index ce90ad9004..85b65b26e4 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -73,7 +73,8 @@ const struct button_mapping generic_directions[] = | |||
73 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ | 73 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ |
74 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 74 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
75 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ | 75 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ |
76 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 76 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
77 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
77 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, | 78 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, |
78 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, | 79 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, |
79 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 80 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
@@ -112,8 +113,7 @@ const struct button_mapping generic_directions[] = | |||
112 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 113 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
113 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 114 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
114 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 115 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
115 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ | 116 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
116 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
117 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, | 117 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, |
118 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, | 118 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, |
119 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 119 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
@@ -150,10 +150,11 @@ const struct button_mapping generic_left_right_fire[] = | |||
150 | { | 150 | { |
151 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | 151 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ |
152 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 152 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
153 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 153 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
154 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ | 154 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ |
155 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 155 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
156 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 156 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
157 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
157 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 158 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
158 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 159 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
159 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 160 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -205,8 +206,7 @@ const struct button_mapping generic_left_right_fire[] = | |||
205 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 206 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
206 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 207 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
207 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, | 208 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, |
208 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ | 209 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
209 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
210 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 210 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
211 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 211 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
212 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 212 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -312,8 +312,7 @@ const struct button_mapping generic_actions[] = | |||
312 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 312 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, |
313 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 313 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
314 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 314 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
315 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD \ | 315 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
316 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
317 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 316 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
318 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 317 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
319 | {PLA_MENU, BUTTON_FF, BUTTON_NONE}, | 318 | {PLA_MENU, BUTTON_FF, BUTTON_NONE}, |
@@ -331,6 +330,12 @@ const struct button_mapping generic_actions[] = | |||
331 | {PLA_MENU, BUTTON_RC_MODE, BUTTON_NONE}, | 330 | {PLA_MENU, BUTTON_RC_MODE, BUTTON_NONE}, |
332 | {PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, | 331 | {PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, |
333 | {PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, | 332 | {PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, |
333 | #elif CONFIG_KEYPAD == MROBE100_PAD | ||
334 | {PLA_QUIT, BUTTON_DISPLAY, BUTTON_NONE}, | ||
335 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | ||
336 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | ||
337 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | ||
338 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | ||
334 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 339 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
335 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 340 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
336 | {PLA_START, BUTTON_UP, BUTTON_NONE}, | 341 | {PLA_START, BUTTON_UP, BUTTON_NONE}, |
@@ -347,14 +352,15 @@ const struct button_mapping generic_increase_decrease[] = | |||
347 | { | 352 | { |
348 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | 353 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ |
349 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 354 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
350 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 355 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
351 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ | 356 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ |
352 | || (CONFIG_KEYPAD == RECORDER_PAD) \ | 357 | || (CONFIG_KEYPAD == RECORDER_PAD) \ |
353 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ | 358 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ |
354 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 359 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
355 | || (CONFIG_KEYPAD == ONDIO_PAD) \ | 360 | || (CONFIG_KEYPAD == ONDIO_PAD) \ |
356 | || (CONFIG_KEYPAD == COWOND2_PAD) \ | 361 | || (CONFIG_KEYPAD == COWOND2_PAD) \ |
357 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 362 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
363 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
358 | {PLA_INC, BUTTON_UP, BUTTON_NONE}, | 364 | {PLA_INC, BUTTON_UP, BUTTON_NONE}, |
359 | {PLA_DEC, BUTTON_DOWN, BUTTON_NONE}, | 365 | {PLA_DEC, BUTTON_DOWN, BUTTON_NONE}, |
360 | {PLA_INC_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE}, | 366 | {PLA_INC_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -375,8 +381,7 @@ const struct button_mapping generic_increase_decrease[] = | |||
375 | #elif CONFIG_KEYPAD == PLAYER_PAD | 381 | #elif CONFIG_KEYPAD == PLAYER_PAD |
376 | {PLA_INC, BUTTON_STOP, BUTTON_NONE}, | 382 | {PLA_INC, BUTTON_STOP, BUTTON_NONE}, |
377 | {PLA_DEC, BUTTON_PLAY, BUTTON_NONE}, | 383 | {PLA_DEC, BUTTON_PLAY, BUTTON_NONE}, |
378 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ | 384 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
379 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
380 | {PLA_INC, BUTTON_SCROLL_UP, BUTTON_NONE}, | 385 | {PLA_INC, BUTTON_SCROLL_UP, BUTTON_NONE}, |
381 | {PLA_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE}, | 386 | {PLA_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE}, |
382 | {PLA_INC_REPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 387 | {PLA_INC_REPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE}, |