diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2010-11-02 10:44:34 +0000 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2010-11-02 10:44:34 +0000 |
commit | 59ba8fea22dad7c998fe515dafeb15b0e91ddbc0 (patch) | |
tree | 94b7927132f035666d8cc34c535a5710e882b4e3 | |
parent | f7bcb66e676df93ab3e5bbff5b71ed4200afaabb (diff) | |
download | rockbox-59ba8fea22dad7c998fe515dafeb15b0e91ddbc0.tar.gz rockbox-59ba8fea22dad7c998fe515dafeb15b0e91ddbc0.zip |
MPIO HD200: rename button defines to adhere how they are labeled on the device.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28443 a1c6a512-1295-4272-9138-f99709370657
53 files changed, 244 insertions, 244 deletions
diff --git a/apps/keymaps/keymap-mpio-hd200.c b/apps/keymaps/keymap-mpio-hd200.c index 7286c3789c..908a0e8f74 100644 --- a/apps/keymaps/keymap-mpio-hd200.c +++ b/apps/keymaps/keymap-mpio-hd200.c | |||
@@ -35,13 +35,13 @@ | |||
35 | *****************************************************************************/ | 35 | *****************************************************************************/ |
36 | 36 | ||
37 | static const struct button_mapping button_context_standard[] = { | 37 | static const struct button_mapping button_context_standard[] = { |
38 | { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, | 38 | { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE }, |
39 | { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 39 | { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
40 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, | 40 | { ACTION_STD_NEXT, BUTTON_FF, BUTTON_NONE }, |
41 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, |
42 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 42 | { ACTION_STD_OK, BUTTON_FUNC|BUTTON_REL, BUTTON_FUNC }, |
43 | { ACTION_STD_CANCEL, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 43 | { ACTION_STD_CANCEL, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
44 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 44 | { ACTION_STD_CONTEXT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC }, |
45 | { ACTION_STD_MENU, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 45 | { ACTION_STD_MENU, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
46 | /* { ACTION_STD_QUICKSCREEN, BUTTON_, BUTTON_ }, */ | 46 | /* { ACTION_STD_QUICKSCREEN, BUTTON_, BUTTON_ }, */ |
47 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ | 47 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ |
@@ -64,14 +64,14 @@ static const struct button_mapping button_context_tree[] = { | |||
64 | }; /* button_context_tree */ | 64 | }; /* button_context_tree */ |
65 | 65 | ||
66 | static const struct button_mapping button_context_wps[] = { | 66 | static const struct button_mapping button_context_wps[] = { |
67 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 67 | { ACTION_WPS_BROWSE, BUTTON_FUNC|BUTTON_REL, BUTTON_FUNC }, |
68 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 68 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
69 | { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 69 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
70 | { ACTION_WPS_SEEKFWD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 70 | { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, |
71 | { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, | 71 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, |
72 | { ACTION_WPS_STOPSEEK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, | 72 | { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_REPEAT }, |
73 | { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 73 | { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, |
74 | { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, | 74 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
75 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 75 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
76 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 76 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
77 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -79,7 +79,7 @@ static const struct button_mapping button_context_wps[] = { | |||
79 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 79 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
80 | /* { ACTION_WPS_PITCHSCREEN, BUTTON_, BUTTON_ }, */ | 80 | /* { ACTION_WPS_PITCHSCREEN, BUTTON_, BUTTON_ }, */ |
81 | /* { ACTION_WPS_ID3SCREEN, BUTTON_, BUTTON_ }, */ | 81 | /* { ACTION_WPS_ID3SCREEN, BUTTON_, BUTTON_ }, */ |
82 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 82 | { ACTION_WPS_CONTEXT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC }, |
83 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 83 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
84 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 84 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
85 | /* { ACTION_WPS_VIEW_PLAYLIST, BUTTON_, BUTTON_ }, */ | 85 | /* { ACTION_WPS_VIEW_PLAYLIST, BUTTON_, BUTTON_ }, */ |
@@ -104,7 +104,7 @@ static const struct button_mapping button_context_settings[] = { | |||
104 | }; /* button_context_settings */ | 104 | }; /* button_context_settings */ |
105 | 105 | ||
106 | static const struct button_mapping button_context_yesno[] = { | 106 | static const struct button_mapping button_context_yesno[] = { |
107 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 107 | { ACTION_YESNO_ACCEPT, BUTTON_FUNC, BUTTON_NONE }, |
108 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, | 108 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, |
109 | 109 | ||
110 | LAST_ITEM_IN_LIST | 110 | LAST_ITEM_IN_LIST |
@@ -121,10 +121,10 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
121 | { ACTION_QS_LEFT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 121 | { ACTION_QS_LEFT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
122 | { ACTION_QS_RIGHT, BUTTON_VOL_UP, BUTTON_NONE }, | 122 | { ACTION_QS_RIGHT, BUTTON_VOL_UP, BUTTON_NONE }, |
123 | { ACTION_QS_RIGHT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 123 | { ACTION_QS_RIGHT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
124 | { ACTION_QS_DOWN, BUTTON_NEXT, BUTTON_NONE }, | 124 | { ACTION_QS_DOWN, BUTTON_FF, BUTTON_NONE }, |
125 | { ACTION_QS_DOWN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 125 | { ACTION_QS_DOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, |
126 | { ACTION_QS_TOP, BUTTON_PREV, BUTTON_NONE }, | 126 | { ACTION_QS_TOP, BUTTON_REW, BUTTON_NONE }, |
127 | { ACTION_QS_TOP, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 127 | { ACTION_QS_TOP, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
128 | 128 | ||
129 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 129 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
130 | }; /* button_context_quickscreen */ | 130 | }; /* button_context_quickscreen */ |
@@ -134,26 +134,26 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
134 | { ACTION_PS_INC_BIG, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 134 | { ACTION_PS_INC_BIG, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
135 | { ACTION_PS_DEC_SMALL, BUTTON_VOL_DOWN, BUTTON_NONE }, | 135 | { ACTION_PS_DEC_SMALL, BUTTON_VOL_DOWN, BUTTON_NONE }, |
136 | { ACTION_PS_DEC_BIG, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 136 | { ACTION_PS_DEC_BIG, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
137 | { ACTION_PS_NUDGE_LEFT, BUTTON_PREV, BUTTON_NONE }, | 137 | { ACTION_PS_NUDGE_LEFT, BUTTON_REW, BUTTON_NONE }, |
138 | { ACTION_PS_NUDGE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | 138 | { ACTION_PS_NUDGE_RIGHT, BUTTON_FF, BUTTON_NONE }, |
139 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_PREV|BUTTON_REL, BUTTON_NONE }, | 139 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, |
140 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, | 140 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_FF|BUTTON_REL, BUTTON_NONE }, |
141 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE }, | 141 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE }, |
142 | { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 142 | { ACTION_PS_RESET, BUTTON_FUNC, BUTTON_NONE }, |
143 | { ACTION_PS_EXIT, BUTTON_REC, BUTTON_NONE }, | 143 | { ACTION_PS_EXIT, BUTTON_REC, BUTTON_NONE }, |
144 | { ACTION_PS_SLOWER, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 144 | { ACTION_PS_SLOWER, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
145 | { ACTION_PS_FASTER, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 145 | { ACTION_PS_FASTER, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, |
146 | 146 | ||
147 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 147 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
148 | }; /* button_context_pitchscreen */ | 148 | }; /* button_context_pitchscreen */ |
149 | 149 | ||
150 | static const struct button_mapping button_context_radio[] = { | 150 | static const struct button_mapping button_context_radio[] = { |
151 | { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, | 151 | { ACTION_FM_MENU, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE }, |
152 | { ACTION_FM_PRESET, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 152 | { ACTION_FM_PRESET, BUTTON_FUNC|BUTTON_REL, BUTTON_FUNC }, |
153 | /* { ACTION_FM_RECORD, BUTTON_, BUTTON_ }, */ | 153 | /* { ACTION_FM_RECORD, BUTTON_, BUTTON_ }, */ |
154 | /* { ACTION_FM_FREEZE, BUTTON_, BUTTON_ }, */ | 154 | /* { ACTION_FM_FREEZE, BUTTON_, BUTTON_ }, */ |
155 | { ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 155 | { ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
156 | { ACTION_FM_MODE, BUTTON_SELECT, BUTTON_NONE }, | 156 | { ACTION_FM_MODE, BUTTON_FUNC, BUTTON_NONE }, |
157 | { ACTION_FM_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 157 | { ACTION_FM_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
158 | { ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 158 | { ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
159 | /* { ACTION_FM_RECORD_DBLPRE, BUTTON_, BUTTON_ }, */ | 159 | /* { ACTION_FM_RECORD_DBLPRE, BUTTON_, BUTTON_ }, */ |
@@ -166,7 +166,7 @@ static const struct button_mapping button_context_radio[] = { | |||
166 | static const struct button_mapping button_context_recscreen[] = { | 166 | static const struct button_mapping button_context_recscreen[] = { |
167 | /* { ACTION_REC_LCD, BUTTON_, BUTTON_ }, */ | 167 | /* { ACTION_REC_LCD, BUTTON_, BUTTON_ }, */ |
168 | { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, | 168 | { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, |
169 | { ACTION_REC_NEWFILE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 169 | { ACTION_REC_NEWFILE, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC }, |
170 | /* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */ | 170 | /* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */ |
171 | /* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */ | 171 | /* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */ |
172 | 172 | ||
@@ -180,17 +180,17 @@ static const struct button_mapping button_context_keyboard[] = { | |||
180 | { ACTION_KBD_RIGHT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 180 | { ACTION_KBD_RIGHT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
181 | /* { ACTION_KBD_CURSOR_LEFT, BUTTON_, BUTTON_ }, */ | 181 | /* { ACTION_KBD_CURSOR_LEFT, BUTTON_, BUTTON_ }, */ |
182 | /* { ACTION_KBD_CURSOR_RIGHT, BUTTON_, BUTTON_ }, */ | 182 | /* { ACTION_KBD_CURSOR_RIGHT, BUTTON_, BUTTON_ }, */ |
183 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 183 | { ACTION_KBD_SELECT, BUTTON_FUNC, BUTTON_NONE }, |
184 | { ACTION_KBD_PAGE_FLIP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 184 | { ACTION_KBD_PAGE_FLIP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
185 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 185 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
186 | { ACTION_KBD_ABORT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 186 | { ACTION_KBD_ABORT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
187 | /* { ACTION_KBD_BACKSPACE, BUTTON_, BUTTON_ }, */ | 187 | /* { ACTION_KBD_BACKSPACE, BUTTON_, BUTTON_ }, */ |
188 | { ACTION_KBD_UP, BUTTON_PREV, BUTTON_NONE }, | 188 | { ACTION_KBD_UP, BUTTON_REW, BUTTON_NONE }, |
189 | { ACTION_KBD_UP, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 189 | { ACTION_KBD_UP, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
190 | { ACTION_KBD_DOWN, BUTTON_NEXT, BUTTON_NONE }, | 190 | { ACTION_KBD_DOWN, BUTTON_FF, BUTTON_NONE }, |
191 | { ACTION_KBD_DOWN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 191 | { ACTION_KBD_DOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, |
192 | { ACTION_KBD_MORSE_INPUT, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 192 | { ACTION_KBD_MORSE_INPUT, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
193 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 193 | { ACTION_KBD_MORSE_SELECT, BUTTON_FUNC|BUTTON_REL, BUTTON_NONE }, |
194 | 194 | ||
195 | LAST_ITEM_IN_LIST | 195 | LAST_ITEM_IN_LIST |
196 | }; /* button_context_keyboard */ | 196 | }; /* button_context_keyboard */ |
@@ -200,14 +200,14 @@ static const struct button_mapping button_context_keyboard[] = { | |||
200 | *****************************************************************************/ | 200 | *****************************************************************************/ |
201 | 201 | ||
202 | static const struct button_mapping button_rc_context_standard[] = { | 202 | static const struct button_mapping button_rc_context_standard[] = { |
203 | { ACTION_STD_PREV, BUTTON_RC_PREV, BUTTON_NONE }, | 203 | { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, |
204 | { ACTION_STD_PREVREPEAT, BUTTON_RC_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 204 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
205 | { ACTION_STD_NEXT, BUTTON_RC_NEXT, BUTTON_NONE }, | 205 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, |
206 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 206 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
207 | { ACTION_STD_OK, BUTTON_RC_SELECT|BUTTON_REL, BUTTON_RC_SELECT }, | 207 | { ACTION_STD_OK, BUTTON_RC_FUNC|BUTTON_REL, BUTTON_RC_FUNC }, |
208 | { ACTION_STD_CANCEL, BUTTON_RC_PLAY|BUTTON_RC_SELECT, BUTTON_RC_SELECT }, | 208 | { ACTION_STD_CANCEL, BUTTON_RC_PLAY|BUTTON_RC_FUNC, BUTTON_RC_FUNC }, |
209 | { ACTION_STD_CONTEXT, BUTTON_RC_SELECT|BUTTON_REPEAT, BUTTON_RC_SELECT }, | 209 | { ACTION_STD_CONTEXT, BUTTON_RC_FUNC|BUTTON_REPEAT, BUTTON_RC_FUNC }, |
210 | { ACTION_STD_MENU, BUTTON_RC_SELECT|BUTTON_RC_PLAY, BUTTON_RC_SELECT }, | 210 | { ACTION_STD_MENU, BUTTON_RC_FUNC|BUTTON_RC_PLAY, BUTTON_RC_FUNC }, |
211 | /* { ACTION_STD_QUICKSCREEN, BUTTON_, BUTTON_ }, */ | 211 | /* { ACTION_STD_QUICKSCREEN, BUTTON_, BUTTON_ }, */ |
212 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ | 212 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ |
213 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ | 213 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ |
@@ -229,14 +229,14 @@ static const struct button_mapping button_rc_context_tree[] = { | |||
229 | }; /* button_context_tree */ | 229 | }; /* button_context_tree */ |
230 | 230 | ||
231 | static const struct button_mapping button_rc_context_wps[] = { | 231 | static const struct button_mapping button_rc_context_wps[] = { |
232 | { ACTION_WPS_BROWSE, BUTTON_RC_SELECT|BUTTON_REL, BUTTON_RC_SELECT }, | 232 | { ACTION_WPS_BROWSE, BUTTON_RC_FUNC|BUTTON_REL, BUTTON_RC_FUNC }, |
233 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | 233 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
234 | { ACTION_WPS_SEEKBACK, BUTTON_RC_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 234 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
235 | { ACTION_WPS_SEEKFWD, BUTTON_RC_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 235 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
236 | { ACTION_WPS_STOPSEEK, BUTTON_RC_PREV|BUTTON_REL, BUTTON_RC_PREV|BUTTON_REPEAT }, | 236 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, |
237 | { ACTION_WPS_STOPSEEK, BUTTON_RC_NEXT|BUTTON_REL, BUTTON_RC_NEXT|BUTTON_REPEAT }, | 237 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, |
238 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_NEXT|BUTTON_REL, BUTTON_RC_NEXT }, | 238 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, |
239 | { ACTION_WPS_SKIPPREV, BUTTON_RC_PREV|BUTTON_REL, BUTTON_RC_PREV }, | 239 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, |
240 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | 240 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
241 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 241 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
242 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 242 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -244,9 +244,9 @@ static const struct button_mapping button_rc_context_wps[] = { | |||
244 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 244 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
245 | /* { ACTION_WPS_PITCHSCREEN, BUTTON_, BUTTON_ }, */ | 245 | /* { ACTION_WPS_PITCHSCREEN, BUTTON_, BUTTON_ }, */ |
246 | /* { ACTION_WPS_ID3SCREEN, BUTTON_, BUTTON_ }, */ | 246 | /* { ACTION_WPS_ID3SCREEN, BUTTON_, BUTTON_ }, */ |
247 | { ACTION_WPS_CONTEXT, BUTTON_RC_SELECT|BUTTON_REPEAT, BUTTON_RC_SELECT }, | 247 | { ACTION_WPS_CONTEXT, BUTTON_RC_FUNC|BUTTON_REPEAT, BUTTON_RC_FUNC }, |
248 | /* { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REL, BUTTON_REC }, */ | 248 | /* { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REL, BUTTON_REC }, */ |
249 | { ACTION_WPS_MENU, BUTTON_RC_SELECT|BUTTON_RC_PLAY, BUTTON_RC_SELECT }, | 249 | { ACTION_WPS_MENU, BUTTON_RC_FUNC|BUTTON_RC_PLAY, BUTTON_RC_FUNC }, |
250 | /* { ACTION_WPS_VIEW_PLAYLIST, BUTTON_, BUTTON_ }, */ | 250 | /* { ACTION_WPS_VIEW_PLAYLIST, BUTTON_, BUTTON_ }, */ |
251 | /* { ACTION_WPS_REC, BUTTON_, BUTTON_ }, */ | 251 | /* { ACTION_WPS_REC, BUTTON_, BUTTON_ }, */ |
252 | /* { ACTION_WPS_ABSETA_PREVDIR, BUTTON_, BUTTON_ }, */ | 252 | /* { ACTION_WPS_ABSETA_PREVDIR, BUTTON_, BUTTON_ }, */ |
@@ -269,20 +269,20 @@ static const struct button_mapping button_rc_context_settings[] = { | |||
269 | }; /* button_context_settings */ | 269 | }; /* button_context_settings */ |
270 | 270 | ||
271 | static const struct button_mapping button_rc_context_yesno[] = { | 271 | static const struct button_mapping button_rc_context_yesno[] = { |
272 | { ACTION_YESNO_ACCEPT, BUTTON_RC_SELECT, BUTTON_NONE }, | 272 | { ACTION_YESNO_ACCEPT, BUTTON_RC_FUNC, BUTTON_NONE }, |
273 | { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, | 273 | { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, |
274 | 274 | ||
275 | LAST_ITEM_IN_LIST | 275 | LAST_ITEM_IN_LIST |
276 | }; /* button_context_yesno */ | 276 | }; /* button_context_yesno */ |
277 | 277 | ||
278 | static const struct button_mapping button_rc_context_radio[] = { | 278 | static const struct button_mapping button_rc_context_radio[] = { |
279 | { ACTION_FM_MENU, BUTTON_RC_SELECT|BUTTON_REPEAT, BUTTON_NONE }, | 279 | { ACTION_FM_MENU, BUTTON_RC_FUNC|BUTTON_REPEAT, BUTTON_NONE }, |
280 | { ACTION_FM_PRESET, BUTTON_RC_SELECT|BUTTON_REL, BUTTON_SELECT }, | 280 | { ACTION_FM_PRESET, BUTTON_RC_FUNC|BUTTON_REL, BUTTON_FUNC }, |
281 | /* { ACTION_FM_RECORD, BUTTON_, BUTTON_ }, */ | 281 | /* { ACTION_FM_RECORD, BUTTON_, BUTTON_ }, */ |
282 | /* { ACTION_FM_FREEZE, BUTTON_, BUTTON_ }, */ | 282 | /* { ACTION_FM_FREEZE, BUTTON_, BUTTON_ }, */ |
283 | { ACTION_FM_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 283 | { ACTION_FM_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
284 | { ACTION_FM_MODE, BUTTON_RC_SELECT, BUTTON_NONE }, | 284 | { ACTION_FM_MODE, BUTTON_RC_FUNC, BUTTON_NONE }, |
285 | { ACTION_FM_EXIT, BUTTON_RC_SELECT|BUTTON_RC_PLAY, BUTTON_RC_SELECT }, | 285 | { ACTION_FM_EXIT, BUTTON_RC_FUNC|BUTTON_RC_PLAY, BUTTON_RC_FUNC }, |
286 | { ACTION_FM_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_PLAY }, | 286 | { ACTION_FM_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_PLAY }, |
287 | /* { ACTION_FM_RECORD_DBLPRE, BUTTON_, BUTTON_ }, */ | 287 | /* { ACTION_FM_RECORD_DBLPRE, BUTTON_, BUTTON_ }, */ |
288 | /* { ACTION_FM_NEXT_PRESET, BUTTON_, BUTTON_ }, */ | 288 | /* { ACTION_FM_NEXT_PRESET, BUTTON_, BUTTON_ }, */ |
@@ -294,7 +294,7 @@ static const struct button_mapping button_rc_context_radio[] = { | |||
294 | static const struct button_mapping button_rc_context_recscreen[] = { | 294 | static const struct button_mapping button_rc_context_recscreen[] = { |
295 | /* { ACTION_REC_LCD, BUTTON_, BUTTON_ }, */ | 295 | /* { ACTION_REC_LCD, BUTTON_, BUTTON_ }, */ |
296 | { ACTION_REC_PAUSE, BUTTON_RC_PLAY, BUTTON_NONE }, | 296 | { ACTION_REC_PAUSE, BUTTON_RC_PLAY, BUTTON_NONE }, |
297 | { ACTION_REC_NEWFILE, BUTTON_RC_SELECT|BUTTON_REPEAT, BUTTON_RC_SELECT }, | 297 | { ACTION_REC_NEWFILE, BUTTON_RC_FUNC|BUTTON_REPEAT, BUTTON_RC_FUNC }, |
298 | /* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */ | 298 | /* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */ |
299 | /* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */ | 299 | /* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */ |
300 | 300 | ||
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 42f73ff47c..1cd28bed8c 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -405,17 +405,17 @@ enum { | |||
405 | #define BJACK_LEFT BUTTON_PREV | 405 | #define BJACK_LEFT BUTTON_PREV |
406 | 406 | ||
407 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 407 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
408 | #define BJACK_SELECT_NAME "SELECT" | 408 | #define BJACK_SELECT_NAME "FUNC" |
409 | #define BJACK_STAY_NAME "RIGHT" | 409 | #define BJACK_STAY_NAME "VOL +" |
410 | #define BJACK_RESUME_NAME "PLAY" | 410 | #define BJACK_RESUME_NAME "PLAY" |
411 | #define BJACK_QUIT_NAME "REC+PLAY" | 411 | #define BJACK_QUIT_NAME "REC+PLAY" |
412 | #define BJACK_DOUBLE_NAME "LEFT" | 412 | #define BJACK_DOUBLE_NAME "VOL -" |
413 | #define BJACK_SELECT BUTTON_SELECT | 413 | #define BJACK_SELECT BUTTON_FUNC |
414 | #define BJACK_QUIT (BUTTON_REC|BUTTON_PLAY) | 414 | #define BJACK_QUIT (BUTTON_REC|BUTTON_PLAY) |
415 | #define BJACK_STAY BUTTON_VOL_UP | 415 | #define BJACK_STAY BUTTON_VOL_UP |
416 | #define BJACK_DOUBLEDOWN BUTTON_VOL_DOWN | 416 | #define BJACK_DOUBLEDOWN BUTTON_VOL_DOWN |
417 | #define BJACK_UP BUTTON_PREV | 417 | #define BJACK_UP BUTTON_REW |
418 | #define BJACK_DOWN BUTTON_NEXT | 418 | #define BJACK_DOWN BUTTON_FF |
419 | #define BJACK_RIGHT BUTTON_VOL_UP | 419 | #define BJACK_RIGHT BUTTON_VOL_UP |
420 | #define BJACK_LEFT BUTTON_VOL_DOWN | 420 | #define BJACK_LEFT BUTTON_VOL_DOWN |
421 | 421 | ||
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 65d46b7522..4a803a3e7f 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -215,10 +215,10 @@ | |||
215 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 215 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
216 | #define BOUNCE_LEFT BUTTON_VOL_DOWN | 216 | #define BOUNCE_LEFT BUTTON_VOL_DOWN |
217 | #define BOUNCE_RIGHT BUTTON_VOL_UP | 217 | #define BOUNCE_RIGHT BUTTON_VOL_UP |
218 | #define BOUNCE_UP BUTTON_PREV | 218 | #define BOUNCE_UP BUTTON_REW |
219 | #define BOUNCE_DOWN BUTTON_NEXT | 219 | #define BOUNCE_DOWN BUTTON_FF |
220 | #define BOUNCE_QUIT (BUTTON_REC | BUTTON_PLAY) | 220 | #define BOUNCE_QUIT (BUTTON_REC | BUTTON_PLAY) |
221 | #define BOUNCE_MODE BUTTON_SELECT | 221 | #define BOUNCE_MODE BUTTON_FUNC |
222 | 222 | ||
223 | #else | 223 | #else |
224 | #error No keymap defined! | 224 | #error No keymap defined! |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 2a025d750b..292eba25c0 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -247,9 +247,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
247 | #define QUIT (BUTTON_REC|BUTTON_PLAY) | 247 | #define QUIT (BUTTON_REC|BUTTON_PLAY) |
248 | #define LEFT BUTTON_VOL_DOWN | 248 | #define LEFT BUTTON_VOL_DOWN |
249 | #define RIGHT BUTTON_VOL_UP | 249 | #define RIGHT BUTTON_VOL_UP |
250 | #define SELECT BUTTON_SELECT | 250 | #define SELECT BUTTON_FUNC |
251 | #define UP BUTTON_PREV | 251 | #define UP BUTTON_REW |
252 | #define DOWN BUTTON_NEXT | 252 | #define DOWN BUTTON_FF |
253 | 253 | ||
254 | #else | 254 | #else |
255 | #error No keymap defined! | 255 | #error No keymap defined! |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 749c4af698..0507ce81d6 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -392,10 +392,10 @@ F3: equal to "=" | |||
392 | #define CALCULATOR_CLEAR BUTTON_CANCEL | 392 | #define CALCULATOR_CLEAR BUTTON_CANCEL |
393 | 393 | ||
394 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 394 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
395 | #define CALCULATOR_LEFT BUTTON_PREV | 395 | #define CALCULATOR_LEFT BUTTON_REW |
396 | #define CALCULATOR_RIGHT BUTTON_NEXT | 396 | #define CALCULATOR_RIGHT BUTTON_FF |
397 | #define CALCULATOR_QUIT (BUTTON_REC|BUTTON_PLAY) | 397 | #define CALCULATOR_QUIT (BUTTON_REC|BUTTON_PLAY) |
398 | #define CALCULATOR_INPUT BUTTON_SELECT | 398 | #define CALCULATOR_INPUT BUTTON_FUNC |
399 | #define CALCULATOR_CALC BUTTON_PLAY | 399 | #define CALCULATOR_CALC BUTTON_PLAY |
400 | 400 | ||
401 | #else | 401 | #else |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index adc73a3749..129b6780f8 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -270,9 +270,9 @@ | |||
270 | 270 | ||
271 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 271 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
272 | #define CALENDAR_QUIT (BUTTON_REC|BUTTON_PLAY) | 272 | #define CALENDAR_QUIT (BUTTON_REC|BUTTON_PLAY) |
273 | #define CALENDAR_SELECT BUTTON_SELECT | 273 | #define CALENDAR_SELECT BUTTON_FUNC |
274 | #define CALENDAR_NEXT_WEEK BUTTON_NEXT | 274 | #define CALENDAR_NEXT_WEEK BUTTON_FF |
275 | #define CALENDAR_PREV_WEEK BUTTON_PREV | 275 | #define CALENDAR_PREV_WEEK BUTTON_REW |
276 | #define CALENDAR_NEXT_DAY BUTTON_VOL_UP | 276 | #define CALENDAR_NEXT_DAY BUTTON_VOL_UP |
277 | #define CALENDAR_PREV_DAY BUTTON_VOL_DOWN | 277 | #define CALENDAR_PREV_DAY BUTTON_VOL_DOWN |
278 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY | 278 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index ee28a4fd55..2ae27e901f 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -367,14 +367,14 @@ | |||
367 | #define CB_MENU BUTTON_MENU | 367 | #define CB_MENU BUTTON_MENU |
368 | 368 | ||
369 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 369 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
370 | #define CB_SELECT BUTTON_SELECT | 370 | #define CB_SELECT BUTTON_FUNC |
371 | #define CB_UP BUTTON_PREV | 371 | #define CB_UP BUTTON_REW |
372 | #define CB_DOWN BUTTON_NEXT | 372 | #define CB_DOWN BUTTON_FF |
373 | #define CB_LEFT BUTTON_VOL_DOWN | 373 | #define CB_LEFT BUTTON_VOL_DOWN |
374 | #define CB_RIGHT BUTTON_VOL_UP | 374 | #define CB_RIGHT BUTTON_VOL_UP |
375 | #define CB_PLAY BUTTON_PLAY | 375 | #define CB_PLAY BUTTON_PLAY |
376 | #define CB_LEVEL BUTTON_REC | 376 | #define CB_LEVEL BUTTON_REC |
377 | #define CB_MENU (BUTTON_SELECT | BUTTON_REPEAT) | 377 | #define CB_MENU (BUTTON_FUNC | BUTTON_REPEAT) |
378 | 378 | ||
379 | #else | 379 | #else |
380 | #error No keymap defined! | 380 | #error No keymap defined! |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 4e6965072a..8711308fc1 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -289,11 +289,11 @@ | |||
289 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 289 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
290 | #define CHC_QUIT (BUTTON_REC|BUTTON_PLAY) | 290 | #define CHC_QUIT (BUTTON_REC|BUTTON_PLAY) |
291 | #define CHC_STARTSTOP BUTTON_PLAY | 291 | #define CHC_STARTSTOP BUTTON_PLAY |
292 | #define CHC_RESET BUTTON_PREV | 292 | #define CHC_RESET BUTTON_REW |
293 | #define CHC_MENU BUTTON_SELECT | 293 | #define CHC_MENU BUTTON_FUNC |
294 | #define CHC_SETTINGS_INC BUTTON_VOL_UP | 294 | #define CHC_SETTINGS_INC BUTTON_VOL_UP |
295 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN | 295 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN |
296 | #define CHC_SETTINGS_OK BUTTON_SELECT | 296 | #define CHC_SETTINGS_OK BUTTON_FUNC |
297 | #define CHC_SETTINGS_CANCEL BUTTON_REC | 297 | #define CHC_SETTINGS_CANCEL BUTTON_REC |
298 | 298 | ||
299 | #else | 299 | #else |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index cca6229a3f..b8f2ed469f 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1139,8 +1139,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
1139 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 1139 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
1140 | 1140 | ||
1141 | #define CHIP8_OFF (BUTTON_REC|BUTTON_PLAY) | 1141 | #define CHIP8_OFF (BUTTON_REC|BUTTON_PLAY) |
1142 | #define CHIP8_KEY2 BUTTON_PREV | 1142 | #define CHIP8_KEY2 BUTTON_REW |
1143 | #define CHIP8_KEY4 BUTTON_NEXT | 1143 | #define CHIP8_KEY4 BUTTON_FF |
1144 | #define CHIP8_KEY5 BUTTON_PLAY | 1144 | #define CHIP8_KEY5 BUTTON_PLAY |
1145 | #define CHIP8_KEY6 BUTTON_VOL_DOWN | 1145 | #define CHIP8_KEY6 BUTTON_VOL_DOWN |
1146 | #define CHIP8_KEY8 BUTTON_VOL_UP | 1146 | #define CHIP8_KEY8 BUTTON_VOL_UP |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 8712a58a4c..e0959c6672 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -165,8 +165,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
165 | 165 | ||
166 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 166 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
167 | #define QUIT (BUTTON_REC|BUTTON_PLAY) | 167 | #define QUIT (BUTTON_REC|BUTTON_PLAY) |
168 | #define ACTION BUTTON_SELECT | 168 | #define ACTION BUTTON_FUNC |
169 | #define ACTIONTEXT "SELECT" | 169 | #define ACTIONTEXT "FUNC" |
170 | 170 | ||
171 | #else | 171 | #else |
172 | #error No keymap defined! | 172 | #error No keymap defined! |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 853286edb8..3fafab05b8 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -281,13 +281,13 @@ | |||
281 | 281 | ||
282 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 282 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
283 | #define CUBE_QUIT (BUTTON_REC | BUTTON_PLAY) | 283 | #define CUBE_QUIT (BUTTON_REC | BUTTON_PLAY) |
284 | #define CUBE_NEXT BUTTON_NEXT | 284 | #define CUBE_NEXT BUTTON_FF |
285 | #define CUBE_PREV BUTTON_PREV | 285 | #define CUBE_PREV BUTTON_REW |
286 | #define CUBE_INC BUTTON_VOL_UP | 286 | #define CUBE_INC BUTTON_VOL_UP |
287 | #define CUBE_DEC BUTTON_VOL_DOWN | 287 | #define CUBE_DEC BUTTON_VOL_DOWN |
288 | #define CUBE_MODE BUTTON_REC | 288 | #define CUBE_MODE BUTTON_REC |
289 | #define CUBE_PAUSE BUTTON_PLAY | 289 | #define CUBE_PAUSE BUTTON_PLAY |
290 | #define CUBE_HIGHSPEED BUTTON_SELECT | 290 | #define CUBE_HIGHSPEED BUTTON_FUNC |
291 | 291 | ||
292 | #else | 292 | #else |
293 | #error No keymap defined! | 293 | #error No keymap defined! |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 7758ca3fea..63b4b18919 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -371,12 +371,12 @@ void I_ShutdownGraphics(void) | |||
371 | #define DOOMBUTTON_ENTER BUTTON_POWER | 371 | #define DOOMBUTTON_ENTER BUTTON_POWER |
372 | #define DOOMBUTTON_WEAPON BUTTON_PLAY | 372 | #define DOOMBUTTON_WEAPON BUTTON_PLAY |
373 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 373 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
374 | #define DOOMBUTTON_UP BUTTON_PREV | 374 | #define DOOMBUTTON_UP BUTTON_REW |
375 | #define DOOMBUTTON_DOWN BUTTON_NEXT | 375 | #define DOOMBUTTON_DOWN BUTTON_FF |
376 | #define DOOMBUTTON_LEFT BUTTON_VOL_DOWN | 376 | #define DOOMBUTTON_LEFT BUTTON_VOL_DOWN |
377 | #define DOOMBUTTON_RIGHT BUTTON_VOL_UP | 377 | #define DOOMBUTTON_RIGHT BUTTON_VOL_UP |
378 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 378 | #define DOOMBUTTON_SHOOT BUTTON_FUNC |
379 | #define DOOMBUTTON_OPEN (BUTTON_SELECT|BUTTON_PLAY) | 379 | #define DOOMBUTTON_OPEN (BUTTON_FUNC|BUTTON_PLAY) |
380 | #define DOOMBUTTON_ESC BUTTON_REC | 380 | #define DOOMBUTTON_ESC BUTTON_REC |
381 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 381 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
382 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 382 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) |
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 70bea5228c..b895a4f864 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c | |||
@@ -216,10 +216,10 @@ GREY_INFO_STRUCT | |||
216 | # define FFT_QUIT BUTTON_REC | 216 | # define FFT_QUIT BUTTON_REC |
217 | 217 | ||
218 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 218 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
219 | # define FFT_PREV_GRAPH BUTTON_PREV | 219 | # define FFT_PREV_GRAPH BUTTON_REW |
220 | # define FFT_NEXT_GRAPH BUTTON_NEXT | 220 | # define FFT_NEXT_GRAPH BUTTON_FF |
221 | # define FFT_ORIENTATION BUTTON_REC | 221 | # define FFT_ORIENTATION BUTTON_REC |
222 | # define FFT_WINDOW BUTTON_SELECT | 222 | # define FFT_WINDOW BUTTON_FUNC |
223 | # define FFT_AMP_SCALE BUTTON_PLAY | 223 | # define FFT_AMP_SCALE BUTTON_PLAY |
224 | # define FFT_QUIT (BUTTON_REC | BUTTON_PLAY) | 224 | # define FFT_QUIT (BUTTON_REC | BUTTON_PLAY) |
225 | 225 | ||
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 077bd67167..ea7fb11cfd 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -120,7 +120,7 @@ | |||
120 | 120 | ||
121 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 121 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
122 | #define BTN_MENU BUTTON_REC | 122 | #define BTN_MENU BUTTON_REC |
123 | #define BTN_FIRE BUTTON_SELECT | 123 | #define BTN_FIRE BUTTON_PLAY |
124 | 124 | ||
125 | #elif defined(HAVE_TOUCHSCREEN) | 125 | #elif defined(HAVE_TOUCHSCREEN) |
126 | /* This is a touchscreen target */ | 126 | /* This is a touchscreen target */ |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 2bc4a1ff97..897f8bd061 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -324,13 +324,13 @@ | |||
324 | 324 | ||
325 | #define FLIPIT_LEFT BUTTON_VOL_DOWN | 325 | #define FLIPIT_LEFT BUTTON_VOL_DOWN |
326 | #define FLIPIT_RIGHT BUTTON_VOL_UP | 326 | #define FLIPIT_RIGHT BUTTON_VOL_UP |
327 | #define FLIPIT_UP BUTTON_PREV | 327 | #define FLIPIT_UP BUTTON_REW |
328 | #define FLIPIT_DOWN BUTTON_NEXT | 328 | #define FLIPIT_DOWN BUTTON_FF |
329 | #define FLIPIT_QUIT (BUTTON_REC|BUTTON_PLAY) | 329 | #define FLIPIT_QUIT (BUTTON_REC|BUTTON_PLAY) |
330 | #define FLIPIT_SHUFFLE BUTTON_SELECT | 330 | #define FLIPIT_SHUFFLE BUTTON_FUNC |
331 | #define FLIPIT_SOLVE BUTTON_REC | 331 | #define FLIPIT_SOLVE BUTTON_REC |
332 | #define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_PREV) | 332 | #define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_REW) |
333 | #define FLIPIT_TOGGLE (BUTTON_PLAY|BUTTON_NEXT) | 333 | #define FLIPIT_TOGGLE (BUTTON_PLAY|BUTTON_FF) |
334 | 334 | ||
335 | #else | 335 | #else |
336 | #error No keymap defined! | 336 | #error No keymap defined! |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 557dde470a..df58bef8c1 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -320,12 +320,12 @@ | |||
320 | 320 | ||
321 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 321 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
322 | #define FRACTAL_QUIT (BUTTON_REC | BUTTON_PLAY) | 322 | #define FRACTAL_QUIT (BUTTON_REC | BUTTON_PLAY) |
323 | #define FRACTAL_UP BUTTON_PREV | 323 | #define FRACTAL_UP BUTTON_REW |
324 | #define FRACTAL_DOWN BUTTON_NEXT | 324 | #define FRACTAL_DOWN BUTTON_FF |
325 | #define FRACTAL_LEFT BUTTON_VOL_DOWN | 325 | #define FRACTAL_LEFT BUTTON_VOL_DOWN |
326 | #define FRACTAL_RIGHT BUTTON_VOL_UP | 326 | #define FRACTAL_RIGHT BUTTON_VOL_UP |
327 | #define FRACTAL_ZOOM_IN (BUTTON_PLAY|BUTTON_NEXT) | 327 | #define FRACTAL_ZOOM_IN (BUTTON_PLAY|BUTTON_FF) |
328 | #define FRACTAL_ZOOM_OUT (BUTTON_PLAY|BUTTON_PREV) | 328 | #define FRACTAL_ZOOM_OUT (BUTTON_PLAY|BUTTON_REW) |
329 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_VOL_UP) | 329 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_VOL_UP) |
330 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_VOL_DOWN) | 330 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_VOL_DOWN) |
331 | #define FRACTAL_RESET BUTTON_REC | 331 | #define FRACTAL_RESET BUTTON_REC |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 978812ac65..fab4f1d766 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -310,14 +310,14 @@ | |||
310 | #define GBN_BUTTON_NEXT_VAR BUTTON_CANCEL | 310 | #define GBN_BUTTON_NEXT_VAR BUTTON_CANCEL |
311 | 311 | ||
312 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 312 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
313 | #define GBN_BUTTON_UP BUTTON_PREV | 313 | #define GBN_BUTTON_UP BUTTON_REW |
314 | #define GBN_BUTTON_DOWN BUTTON_NEXT | 314 | #define GBN_BUTTON_DOWN BUTTON_FF |
315 | #define GBN_BUTTON_LEFT BUTTON_VOL_DOWN | 315 | #define GBN_BUTTON_LEFT BUTTON_VOL_DOWN |
316 | #define GBN_BUTTON_RIGHT BUTTON_VOL_UP | 316 | #define GBN_BUTTON_RIGHT BUTTON_VOL_UP |
317 | #define GBN_BUTTON_RETREAT BUTTON_REC | 317 | #define GBN_BUTTON_RETREAT BUTTON_REC |
318 | #define GBN_BUTTON_ADVANCE BUTTON_PLAY | 318 | #define GBN_BUTTON_ADVANCE BUTTON_PLAY |
319 | #define GBN_BUTTON_PLAY BUTTON_SELECT | BUTTON_REL | 319 | #define GBN_BUTTON_PLAY BUTTON_FUNC | BUTTON_REL |
320 | #define GBN_BUTTON_MENU BUTTON_SELECT | BUTTON_REPEAT | 320 | #define GBN_BUTTON_MENU BUTTON_FUNC | BUTTON_REPEAT |
321 | 321 | ||
322 | #else | 322 | #else |
323 | #error Unsupported keypad | 323 | #error Unsupported keypad |
diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h index 6c137cc47f..3e4e16a9aa 100644 --- a/apps/plugins/imageviewer/imageviewer.h +++ b/apps/plugins/imageviewer/imageviewer.h | |||
@@ -319,13 +319,13 @@ | |||
319 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 319 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
320 | #define IMGVIEW_ZOOM_IN (BUTTON_REC|BUTTON_VOL_UP) | 320 | #define IMGVIEW_ZOOM_IN (BUTTON_REC|BUTTON_VOL_UP) |
321 | #define IMGVIEW_ZOOM_OUT (BUTTON_REC|BUTTON_VOL_DOWN) | 321 | #define IMGVIEW_ZOOM_OUT (BUTTON_REC|BUTTON_VOL_DOWN) |
322 | #define IMGVIEW_UP BUTTON_PREV | 322 | #define IMGVIEW_UP BUTTON_REW |
323 | #define IMGVIEW_DOWN BUTTON_NEXT | 323 | #define IMGVIEW_DOWN BUTTON_FF |
324 | #define IMGVIEW_LEFT BUTTON_VOL_DOWN | 324 | #define IMGVIEW_LEFT BUTTON_VOL_DOWN |
325 | #define IMGVIEW_RIGHT BUTTON_VOL_UP | 325 | #define IMGVIEW_RIGHT BUTTON_VOL_UP |
326 | #define IMGVIEW_NEXT (BUTTON_REC | BUTTON_NEXT) | 326 | #define IMGVIEW_NEXT (BUTTON_REC | BUTTON_FF) |
327 | #define IMGVIEW_PREVIOUS (BUTTON_REC | BUTTON_PREV) | 327 | #define IMGVIEW_PREVIOUS (BUTTON_REC | BUTTON_REW) |
328 | #define IMGVIEW_MENU BUTTON_SELECT | 328 | #define IMGVIEW_MENU BUTTON_FUNC |
329 | #define IMGVIEW_QUIT (BUTTON_REC | BUTTON_PLAY) | 329 | #define IMGVIEW_QUIT (BUTTON_REC | BUTTON_PLAY) |
330 | 330 | ||
331 | #else | 331 | #else |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index fc20c674aa..218395027e 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -276,11 +276,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
276 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 276 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
277 | #define JEWELS_LEFT BUTTON_VOL_DOWN | 277 | #define JEWELS_LEFT BUTTON_VOL_DOWN |
278 | #define JEWELS_RIGHT BUTTON_VOL_UP | 278 | #define JEWELS_RIGHT BUTTON_VOL_UP |
279 | #define JEWELS_UP BUTTON_PREV | 279 | #define JEWELS_UP BUTTON_REW |
280 | #define JEWELS_DOWN BUTTON_NEXT | 280 | #define JEWELS_DOWN BUTTON_FF |
281 | #define JEWELS_SELECT BUTTON_SELECT | 281 | #define JEWELS_SELECT BUTTON_FUNC |
282 | #define JEWELS_CANCEL BUTTON_REC | 282 | #define JEWELS_CANCEL BUTTON_REC |
283 | #define HK_SELECT "SELECT" | 283 | #define HK_SELECT "FUNC" |
284 | #define HK_CANCEL "REC" | 284 | #define HK_CANCEL "REC" |
285 | 285 | ||
286 | #else | 286 | #else |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 59756f530e..ee052c5060 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -191,12 +191,12 @@ const struct button_mapping pla_main_ctx[] = | |||
191 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE}, | 191 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE}, |
192 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, | 192 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, |
193 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 193 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
194 | { PLA_UP, BUTTON_PREV, BUTTON_NONE}, | 194 | { PLA_UP, BUTTON_REW, BUTTON_NONE}, |
195 | { PLA_DOWN, BUTTON_NEXT, BUTTON_NONE}, | 195 | { PLA_DOWN, BUTTON_FF, BUTTON_NONE}, |
196 | { PLA_LEFT, BUTTON_VOL_DOWN, BUTTON_NONE}, | 196 | { PLA_LEFT, BUTTON_VOL_DOWN, BUTTON_NONE}, |
197 | { PLA_RIGHT, BUTTON_VOL_UP, BUTTON_NONE}, | 197 | { PLA_RIGHT, BUTTON_VOL_UP, BUTTON_NONE}, |
198 | { PLA_UP_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE}, | 198 | { PLA_UP_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE}, |
199 | { PLA_DOWN_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, | 199 | { PLA_DOWN_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE}, |
200 | { PLA_LEFT_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 200 | { PLA_LEFT_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
201 | { PLA_RIGHT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 201 | { PLA_RIGHT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
202 | #else | 202 | #else |
@@ -361,9 +361,9 @@ const struct button_mapping pla_main_ctx[] = | |||
361 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 361 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
362 | {PLA_CANCEL, BUTTON_REC, BUTTON_NONE}, | 362 | {PLA_CANCEL, BUTTON_REC, BUTTON_NONE}, |
363 | {PLA_EXIT, (BUTTON_REC|BUTTON_PLAY), BUTTON_NONE}, | 363 | {PLA_EXIT, (BUTTON_REC|BUTTON_PLAY), BUTTON_NONE}, |
364 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | 364 | {PLA_SELECT, BUTTON_FUNC, BUTTON_NONE}, |
365 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 365 | {PLA_SELECT_REL, BUTTON_FUNC|BUTTON_REL, BUTTON_FUNC}, |
366 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 366 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, |
367 | #else | 367 | #else |
368 | # ifndef HAVE_TOUCHSCREEN | 368 | # ifndef HAVE_TOUCHSCREEN |
369 | # error pluginlib_actions: No actions defined | 369 | # error pluginlib_actions: No actions defined |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 43a7c3fd46..aedf66dbf3 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -197,8 +197,8 @@ const unsigned char rockbox16x7[] = { | |||
197 | #define LP_QUIT (BUTTON_REC|BUTTON_PLAY) | 197 | #define LP_QUIT (BUTTON_REC|BUTTON_PLAY) |
198 | #define LP_DEC_X BUTTON_VOL_DOWN | 198 | #define LP_DEC_X BUTTON_VOL_DOWN |
199 | #define LP_INC_X BUTTON_VOL_UP | 199 | #define LP_INC_X BUTTON_VOL_UP |
200 | #define LP_DEC_Y BUTTON_PREV | 200 | #define LP_DEC_Y BUTTON_REW |
201 | #define LP_INC_Y BUTTON_NEXT | 201 | #define LP_INC_Y BUTTON_FF |
202 | 202 | ||
203 | #else | 203 | #else |
204 | #define LP_QUIT BUTTON_OFF | 204 | #define LP_QUIT BUTTON_OFF |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 5a3c461bdc..77743e44f4 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -197,8 +197,8 @@ | |||
197 | #define BTN_QUIT (BUTTON_REC | BUTTON_PLAY) | 197 | #define BTN_QUIT (BUTTON_REC | BUTTON_PLAY) |
198 | #define BTN_RIGHT BUTTON_VOL_DOWN | 198 | #define BTN_RIGHT BUTTON_VOL_DOWN |
199 | #define BTN_LEFT BUTTON_VOL_UP | 199 | #define BTN_LEFT BUTTON_VOL_UP |
200 | #define BTN_UP BUTTON_PREV | 200 | #define BTN_UP BUTTON_REW |
201 | #define BTN_DOWN BUTTON_NEXT | 201 | #define BTN_DOWN BUTTON_FF |
202 | #define BTN_PLAY BUTTON_PLAY | 202 | #define BTN_PLAY BUTTON_PLAY |
203 | 203 | ||
204 | #else | 204 | #else |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 3925c2c7bc..1153972ccb 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -260,11 +260,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
260 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 260 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
261 | # define MINESWP_LEFT BUTTON_VOL_DOWN | 261 | # define MINESWP_LEFT BUTTON_VOL_DOWN |
262 | # define MINESWP_RIGHT BUTTON_VOL_UP | 262 | # define MINESWP_RIGHT BUTTON_VOL_UP |
263 | # define MINESWP_UP BUTTON_PREV | 263 | # define MINESWP_UP BUTTON_REW |
264 | # define MINESWP_DOWN BUTTON_NEXT | 264 | # define MINESWP_DOWN BUTTON_FF |
265 | # define MINESWP_QUIT (BUTTON_REC|BUTTON_PLAY) | 265 | # define MINESWP_QUIT (BUTTON_REC|BUTTON_PLAY) |
266 | # define MINESWP_TOGGLE BUTTON_PLAY | 266 | # define MINESWP_TOGGLE BUTTON_PLAY |
267 | # define MINESWP_DISCOVER BUTTON_SELECT | 267 | # define MINESWP_DISCOVER BUTTON_FUNC |
268 | # define MINESWP_INFO BUTTON_REC | 268 | # define MINESWP_INFO BUTTON_REC |
269 | 269 | ||
270 | #else | 270 | #else |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 42c9254259..ecdd09ac1d 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -170,7 +170,7 @@ | |||
170 | 170 | ||
171 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 171 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
172 | #define MOSAIQUE_QUIT (BUTTON_REC | BUTTON_PLAY) | 172 | #define MOSAIQUE_QUIT (BUTTON_REC | BUTTON_PLAY) |
173 | #define MOSAIQUE_SPEED BUTTON_SELECT | 173 | #define MOSAIQUE_SPEED BUTTON_FUNC |
174 | #define MOSAIQUE_RESTART BUTTON_PLAY | 174 | #define MOSAIQUE_RESTART BUTTON_PLAY |
175 | 175 | ||
176 | #else | 176 | #else |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 5088187b76..caf63432f8 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2463,10 +2463,10 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
2463 | #define MP3ENC_SELECT BUTTON_OK | 2463 | #define MP3ENC_SELECT BUTTON_OK |
2464 | 2464 | ||
2465 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 2465 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
2466 | #define MP3ENC_PREV BUTTON_PREV | 2466 | #define MP3ENC_PREV BUTTON_REW |
2467 | #define MP3ENC_NEXT BUTTON_NEXT | 2467 | #define MP3ENC_NEXT BUTTON_FF |
2468 | #define MP3ENC_DONE BUTTON_PLAY | 2468 | #define MP3ENC_DONE BUTTON_PLAY |
2469 | #define MP3ENC_SELECT BUTTON_SELECT | 2469 | #define MP3ENC_SELECT BUTTON_FUNC |
2470 | 2470 | ||
2471 | #else | 2471 | #else |
2472 | #error No keymap defined! | 2472 | #error No keymap defined! |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 1f321c1285..53cbab32c6 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -207,9 +207,9 @@ struct mpeg_settings settings; | |||
207 | #define MPEG_START_TIME_EXIT BUTTON_REC | 207 | #define MPEG_START_TIME_EXIT BUTTON_REC |
208 | 208 | ||
209 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 209 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
210 | #define MPEG_START_TIME_SELECT BUTTON_SELECT | 210 | #define MPEG_START_TIME_SELECT BUTTON_FUNC |
211 | #define MPEG_START_TIME_LEFT BUTTON_PREV | 211 | #define MPEG_START_TIME_LEFT BUTTON_REW |
212 | #define MPEG_START_TIME_RIGHT BUTTON_NEXT | 212 | #define MPEG_START_TIME_RIGHT BUTTON_FF |
213 | #define MPEG_START_TIME_UP BUTTON_VOL_UP | 213 | #define MPEG_START_TIME_UP BUTTON_VOL_UP |
214 | #define MPEG_START_TIME_DOWN BUTTON_VOL_DOWN | 214 | #define MPEG_START_TIME_DOWN BUTTON_VOL_DOWN |
215 | #define MPEG_START_TIME_EXIT BUTTON_REC | 215 | #define MPEG_START_TIME_EXIT BUTTON_REC |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 5b333c33f7..512cc70cee 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -319,13 +319,13 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
319 | #define MPEG_FF BUTTON_NEXT | 319 | #define MPEG_FF BUTTON_NEXT |
320 | 320 | ||
321 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 321 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
322 | #define MPEG_MENU BUTTON_SELECT | 322 | #define MPEG_MENU BUTTON_FUNC |
323 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) | 323 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) |
324 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) | 324 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) |
325 | #define MPEG_VOLDOWN BUTTON_VOL_DOWN | 325 | #define MPEG_VOLDOWN BUTTON_VOL_DOWN |
326 | #define MPEG_VOLUP BUTTON_VOL_UP | 326 | #define MPEG_VOLUP BUTTON_VOL_UP |
327 | #define MPEG_RW BUTTON_PREV | 327 | #define MPEG_RW BUTTON_REW |
328 | #define MPEG_FF BUTTON_NEXT | 328 | #define MPEG_FF BUTTON_FF |
329 | 329 | ||
330 | #else | 330 | #else |
331 | #error No keymap defined! | 331 | #error No keymap defined! |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 7c73ee6ce1..2d0d58eca5 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -300,12 +300,12 @@ | |||
300 | 300 | ||
301 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 301 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
302 | #define OSCILLOSCOPE_QUIT (BUTTON_REC | BUTTON_PLAY) | 302 | #define OSCILLOSCOPE_QUIT (BUTTON_REC | BUTTON_PLAY) |
303 | #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT | 303 | #define OSCILLOSCOPE_DRAWMODE BUTTON_FUNC |
304 | #define OSCILLOSCOPE_ADVMODE BUTTON_REC | 304 | #define OSCILLOSCOPE_ADVMODE BUTTON_REC |
305 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT|BUTTON_REPEAT) | 305 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_FUNC|BUTTON_REPEAT) |
306 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY | 306 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY |
307 | #define OSCILLOSCOPE_SPEED_UP BUTTON_NEXT | 307 | #define OSCILLOSCOPE_SPEED_UP BUTTON_FF |
308 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_PREV | 308 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_REW |
309 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP | 309 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP |
310 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 310 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
311 | 311 | ||
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 1c4b2fcb6e..9fa35e3c29 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -419,23 +419,23 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
419 | #define SELECT_TEXT "PLAY" | 419 | #define SELECT_TEXT "PLAY" |
420 | 420 | ||
421 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 421 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
422 | #define PEGBOX_SAVE (BUTTON_PLAY|BUTTON_SELECT) | 422 | #define PEGBOX_SAVE (BUTTON_PLAY|BUTTON_FUNC) |
423 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) | 423 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) |
424 | #define PEGBOX_RESTART BUTTON_REC | 424 | #define PEGBOX_RESTART BUTTON_REC |
425 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_PREV) | 425 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_REW) |
426 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_NEXT) | 426 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_FF) |
427 | #define PEGBOX_UP BUTTON_PREV | 427 | #define PEGBOX_UP BUTTON_REW |
428 | #define PEGBOX_DOWN BUTTON_NEXT | 428 | #define PEGBOX_DOWN BUTTON_FF |
429 | #define PEGBOX_RIGHT BUTTON_VOL_UP | 429 | #define PEGBOX_RIGHT BUTTON_VOL_UP |
430 | #define PEGBOX_LEFT BUTTON_VOL_DOWN | 430 | #define PEGBOX_LEFT BUTTON_VOL_DOWN |
431 | #define PEGBOX_SELECT BUTTON_SELECT | 431 | #define PEGBOX_SELECT BUTTON_FUNC |
432 | 432 | ||
433 | #define SAVE_TEXT "PLAY + SELECT" | 433 | #define SAVE_TEXT "PLAY + FUNC" |
434 | #define QUIT_TEXT "REC + PLAY" | 434 | #define QUIT_TEXT "REC + PLAY" |
435 | #define RESTART_TEXT "REC" | 435 | #define RESTART_TEXT "REC" |
436 | #define LVL_UP_TEXT "PREV" | 436 | #define LVL_UP_TEXT "REW" |
437 | #define LVL_DOWN_TEXT "NEXT" | 437 | #define LVL_DOWN_TEXT "FF" |
438 | #define SELECT_TEXT "SELECT" | 438 | #define SELECT_TEXT "FUNC" |
439 | 439 | ||
440 | #else | 440 | #else |
441 | #error Unsupported keymap! | 441 | #error Unsupported keymap! |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 83a8e48228..93b6e7c278 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -211,8 +211,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
211 | 211 | ||
212 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 212 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
213 | #define PONG_QUIT (BUTTON_REC|BUTTON_PLAY) | 213 | #define PONG_QUIT (BUTTON_REC|BUTTON_PLAY) |
214 | #define PONG_LEFT_UP BUTTON_PREV | 214 | #define PONG_LEFT_UP BUTTON_REW |
215 | #define PONG_LEFT_DOWN BUTTON_NEXT | 215 | #define PONG_LEFT_DOWN BUTTON_FF |
216 | #define PONG_RIGHT_UP BUTTON_VOL_UP | 216 | #define PONG_RIGHT_UP BUTTON_VOL_UP |
217 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 217 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
218 | 218 | ||
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 9b4c43ca21..46d80bc702 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -217,13 +217,13 @@ | |||
217 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 217 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
218 | 218 | ||
219 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 219 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
220 | #define REVERSI_BUTTON_UP BUTTON_PREV | 220 | #define REVERSI_BUTTON_UP BUTTON_REW |
221 | #define REVERSI_BUTTON_DOWN BUTTON_NEXT | 221 | #define REVERSI_BUTTON_DOWN BUTTON_FF |
222 | #define REVERSI_BUTTON_LEFT BUTTON_VOL_DOWN | 222 | #define REVERSI_BUTTON_LEFT BUTTON_VOL_DOWN |
223 | #define REVERSI_BUTTON_RIGHT BUTTON_VOL_UP | 223 | #define REVERSI_BUTTON_RIGHT BUTTON_VOL_UP |
224 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT | 224 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_FUNC |
225 | #define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS | 225 | #define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS |
226 | #define REVERSI_BUTTON_MENU BUTTON_SELECT | 226 | #define REVERSI_BUTTON_MENU BUTTON_FUNC |
227 | #define REVERSI_BUTTON_MENU_LONGPRESS | 227 | #define REVERSI_BUTTON_MENU_LONGPRESS |
228 | 228 | ||
229 | #else | 229 | #else |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 44d637d8fa..2bab546fa0 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -329,9 +329,9 @@ | |||
329 | 329 | ||
330 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 330 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
331 | #define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY) | 331 | #define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY) |
332 | #define ROCKBLOX_ROTATE_CCW BUTTON_PREV | 332 | #define ROCKBLOX_ROTATE_CCW BUTTON_REW |
333 | #define ROCKBLOX_ROTATE_CW BUTTON_NEXT | 333 | #define ROCKBLOX_ROTATE_CW BUTTON_FF |
334 | #define ROCKBLOX_DOWN BUTTON_SELECT | 334 | #define ROCKBLOX_DOWN BUTTON_FUNC |
335 | #define ROCKBLOX_LEFT BUTTON_VOL_DOWN | 335 | #define ROCKBLOX_LEFT BUTTON_VOL_DOWN |
336 | #define ROCKBLOX_RIGHT BUTTON_VOL_UP | 336 | #define ROCKBLOX_RIGHT BUTTON_VOL_UP |
337 | #define ROCKBLOX_DROP BUTTON_PLAY | 337 | #define ROCKBLOX_DROP BUTTON_PLAY |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 96937bbae9..a39da86ec1 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -113,7 +113,7 @@ | |||
113 | #define ONEDROCKBLOX_QUIT BUTTON_REC | 113 | #define ONEDROCKBLOX_QUIT BUTTON_REC |
114 | 114 | ||
115 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 115 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
116 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 116 | #define ONEDROCKBLOX_DOWN BUTTON_FUNC |
117 | #define ONEDROCKBLOX_QUIT (BUTTON_REC | BUTTON_PLAY) | 117 | #define ONEDROCKBLOX_QUIT (BUTTON_REC | BUTTON_PLAY) |
118 | 118 | ||
119 | #elif defined(HAVE_TOUCHSCREEN) | 119 | #elif defined(HAVE_TOUCHSCREEN) |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 517a3a1690..0f51c4d849 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -222,8 +222,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
222 | #define PUZZLE_QUIT (BUTTON_REC | BUTTON_PLAY) | 222 | #define PUZZLE_QUIT (BUTTON_REC | BUTTON_PLAY) |
223 | #define PUZZLE_LEFT BUTTON_VOL_DOWN | 223 | #define PUZZLE_LEFT BUTTON_VOL_DOWN |
224 | #define PUZZLE_RIGHT BUTTON_VOL_UP | 224 | #define PUZZLE_RIGHT BUTTON_VOL_UP |
225 | #define PUZZLE_UP BUTTON_PREV | 225 | #define PUZZLE_UP BUTTON_REW |
226 | #define PUZZLE_DOWN BUTTON_NEXT | 226 | #define PUZZLE_DOWN BUTTON_FF |
227 | #define PUZZLE_SHUFFLE BUTTON_REC | 227 | #define PUZZLE_SHUFFLE BUTTON_REC |
228 | #define PUZZLE_PICTURE BUTTON_PLAY | 228 | #define PUZZLE_PICTURE BUTTON_PLAY |
229 | 229 | ||
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index eb2b311fc9..5ccbcd0b7e 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -212,8 +212,8 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
212 | #define SNAKE_QUIT (BUTTON_REC|BUTTON_PLAY) | 212 | #define SNAKE_QUIT (BUTTON_REC|BUTTON_PLAY) |
213 | #define SNAKE_LEFT BUTTON_VOL_DOWN | 213 | #define SNAKE_LEFT BUTTON_VOL_DOWN |
214 | #define SNAKE_RIGHT BUTTON_VOL_UP | 214 | #define SNAKE_RIGHT BUTTON_VOL_UP |
215 | #define SNAKE_UP BUTTON_PREV | 215 | #define SNAKE_UP BUTTON_REW |
216 | #define SNAKE_DOWN BUTTON_NEXT | 216 | #define SNAKE_DOWN BUTTON_FF |
217 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 217 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
218 | 218 | ||
219 | #else | 219 | #else |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index eb101cf1bd..99005efc0d 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -320,8 +320,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
320 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 320 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
321 | #define SNAKE2_LEFT BUTTON_VOL_DOWN | 321 | #define SNAKE2_LEFT BUTTON_VOL_DOWN |
322 | #define SNAKE2_RIGHT BUTTON_VOL_UP | 322 | #define SNAKE2_RIGHT BUTTON_VOL_UP |
323 | #define SNAKE2_UP BUTTON_PREV | 323 | #define SNAKE2_UP BUTTON_REW |
324 | #define SNAKE2_DOWN BUTTON_NEXT | 324 | #define SNAKE2_DOWN BUTTON_FF |
325 | #define SNAKE2_QUIT (BUTTON_REC | BUTTON_PLAY) | 325 | #define SNAKE2_QUIT (BUTTON_REC | BUTTON_PLAY) |
326 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY | 326 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY |
327 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 327 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 1159402bac..a8f7e34fa7 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -449,17 +449,17 @@ | |||
449 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 449 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
450 | #define SOKOBAN_LEFT BUTTON_VOL_DOWN | 450 | #define SOKOBAN_LEFT BUTTON_VOL_DOWN |
451 | #define SOKOBAN_RIGHT BUTTON_VOL_UP | 451 | #define SOKOBAN_RIGHT BUTTON_VOL_UP |
452 | #define SOKOBAN_UP BUTTON_PREV | 452 | #define SOKOBAN_UP BUTTON_REW |
453 | #define SOKOBAN_DOWN BUTTON_NEXT | 453 | #define SOKOBAN_DOWN BUTTON_FF |
454 | #define SOKOBAN_MENU BUTTON_SELECT | 454 | #define SOKOBAN_MENU BUTTON_FUNC |
455 | #define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_PREV) | 455 | #define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REW) |
456 | #define SOKOBAN_REDO (BUTTON_PLAY | BUTTON_NEXT) | 456 | #define SOKOBAN_REDO (BUTTON_PLAY | BUTTON_FF) |
457 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_VOL_DOWN) | 457 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_VOL_DOWN) |
458 | #define SOKOBAN_LEVEL_REPEAT BUTTON_REC | 458 | #define SOKOBAN_LEVEL_REPEAT BUTTON_REC |
459 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_VOL_UP) | 459 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_VOL_UP) |
460 | #define SOKOBAN_PAUSE BUTTON_PLAY | 460 | #define SOKOBAN_PAUSE BUTTON_PLAY |
461 | #define BUTTON_SAVE (BUTTON_PLAY|BUTTON_SELECT) | 461 | #define BUTTON_SAVE (BUTTON_PLAY|BUTTON_FUNC) |
462 | #define BUTTON_SAVE_NAME "PLAY+SELECT" | 462 | #define BUTTON_SAVE_NAME "PLAY+FUNC" |
463 | 463 | ||
464 | #else | 464 | #else |
465 | #error No keymap defined! | 465 | #error No keymap defined! |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 9c80cff272..feafd42f76 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -473,17 +473,17 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
473 | 473 | ||
474 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 474 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
475 | # define SOL_QUIT (BUTTON_REC | BUTTON_PLAY) | 475 | # define SOL_QUIT (BUTTON_REC | BUTTON_PLAY) |
476 | # define SOL_UP BUTTON_PREV | 476 | # define SOL_UP BUTTON_REW |
477 | # define SOL_DOWN BUTTON_NEXT | 477 | # define SOL_DOWN BUTTON_FF |
478 | # define SOL_LEFT BUTTON_VOL_DOWN | 478 | # define SOL_LEFT BUTTON_VOL_DOWN |
479 | # define SOL_RIGHT BUTTON_VOL_UP | 479 | # define SOL_RIGHT BUTTON_VOL_UP |
480 | # define SOL_MOVE_PRE BUTTON_SELECT | 480 | # define SOL_MOVE_PRE BUTTON_FUNC |
481 | # define SOL_MOVE (BUTTON_SELECT | BUTTON_REL) | 481 | # define SOL_MOVE (BUTTON_FUNC | BUTTON_REL) |
482 | # define SOL_DRAW BUTTON_REC | 482 | # define SOL_DRAW BUTTON_REC |
483 | # define SOL_REM2CUR (BUTTON_REC | BUTTON_REPEAT) | 483 | # define SOL_REM2CUR (BUTTON_REC | BUTTON_REPEAT) |
484 | # define SOL_CUR2STACK BUTTON_PLAY | 484 | # define SOL_CUR2STACK BUTTON_PLAY |
485 | # define SOL_REM2STACK (BUTTON_PLAY | BUTTON_REPEAT) | 485 | # define SOL_REM2STACK (BUTTON_PLAY | BUTTON_REPEAT) |
486 | # define HK_MOVE "SELECT" | 486 | # define HK_MOVE "FUNC" |
487 | # define HK_DRAW "REC" | 487 | # define HK_DRAW "REC" |
488 | # define HK_REM2CUR "REC.." | 488 | # define HK_REM2CUR "REC.." |
489 | # define HK_CUR2STACK "PLAY" | 489 | # define HK_CUR2STACK "PLAY" |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 206d52aed8..1fd407357e 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -231,13 +231,13 @@ | |||
231 | 231 | ||
232 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 232 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
233 | 233 | ||
234 | #define AST_PAUSE (BUTTON_PLAY|BUTTON_SELECT) | 234 | #define AST_PAUSE (BUTTON_PLAY|BUTTON_FUNC) |
235 | #define AST_QUIT (BUTTON_REC|BUTTON_PLAY) | 235 | #define AST_QUIT (BUTTON_REC|BUTTON_PLAY) |
236 | #define AST_THRUST BUTTON_REC | 236 | #define AST_THRUST BUTTON_REC |
237 | #define AST_HYPERSPACE BUTTON_PLAY | 237 | #define AST_HYPERSPACE BUTTON_PLAY |
238 | #define AST_LEFT BUTTON_PREV | 238 | #define AST_LEFT BUTTON_REW |
239 | #define AST_RIGHT BUTTON_NEXT | 239 | #define AST_RIGHT BUTTON_FF |
240 | #define AST_FIRE BUTTON_SELECT | 240 | #define AST_FIRE BUTTON_FUNC |
241 | 241 | ||
242 | #else | 242 | #else |
243 | #error No keymap defined! | 243 | #error No keymap defined! |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index a653bdb4a9..884c678920 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -398,18 +398,18 @@ | |||
398 | #define STAR_QUIT (BUTTON_REC | BUTTON_PLAY) | 398 | #define STAR_QUIT (BUTTON_REC | BUTTON_PLAY) |
399 | #define STAR_LEFT BUTTON_VOL_DOWN | 399 | #define STAR_LEFT BUTTON_VOL_DOWN |
400 | #define STAR_RIGHT BUTTON_VOL_UP | 400 | #define STAR_RIGHT BUTTON_VOL_UP |
401 | #define STAR_UP BUTTON_PREV | 401 | #define STAR_UP BUTTON_REW |
402 | #define STAR_DOWN BUTTON_NEXT | 402 | #define STAR_DOWN BUTTON_FF |
403 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT | 403 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_FUNC |
404 | #define STAR_TOGGLE_CONTROL (BUTTON_SELECT | BUTTON_REL) | 404 | #define STAR_TOGGLE_CONTROL (BUTTON_FUNC | BUTTON_REL) |
405 | #define STAR_LEVEL_UP BUTTON_PLAY | 405 | #define STAR_LEVEL_UP BUTTON_PLAY |
406 | #define STAR_LEVEL_DOWN BUTTON_REC | 406 | #define STAR_LEVEL_DOWN BUTTON_REC |
407 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_REPEAT) | 407 | #define STAR_LEVEL_REPEAT (BUTTON_FUNC | BUTTON_REPEAT) |
408 | #define STAR_TOGGLE_CONTROL_NAME "SELECT" | 408 | #define STAR_TOGGLE_CONTROL_NAME "FUNC" |
409 | #define STAR_QUIT_NAME "REC + PLAY" | 409 | #define STAR_QUIT_NAME "REC + PLAY" |
410 | #define STAR_LEVEL_UP_NAME "PLAY" | 410 | #define STAR_LEVEL_UP_NAME "PLAY" |
411 | #define STAR_LEVEL_DOWN_NAME "REC" | 411 | #define STAR_LEVEL_DOWN_NAME "REC" |
412 | #define STAR_LEVEL_REPEAT_NAME "SELECT LONG" | 412 | #define STAR_LEVEL_REPEAT_NAME "FUNC LONG" |
413 | 413 | ||
414 | #else | 414 | #else |
415 | #error No keymap defined! | 415 | #error No keymap defined! |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 6ddc268285..b8b7569205 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -159,8 +159,8 @@ | |||
159 | #define STARFIELD_QUIT (BUTTON_REC|BUTTON_PLAY) | 159 | #define STARFIELD_QUIT (BUTTON_REC|BUTTON_PLAY) |
160 | #define STARFIELD_INCREASE_ZMOVE BUTTON_VOL_UP | 160 | #define STARFIELD_INCREASE_ZMOVE BUTTON_VOL_UP |
161 | #define STARFIELD_DECREASE_ZMOVE BUTTON_VOL_DOWN | 161 | #define STARFIELD_DECREASE_ZMOVE BUTTON_VOL_DOWN |
162 | #define STARFIELD_INCREASE_NB_STARS BUTTON_NEXT | 162 | #define STARFIELD_INCREASE_NB_STARS BUTTON_FF |
163 | #define STARFIELD_DECREASE_NB_STARS BUTTON_PREV | 163 | #define STARFIELD_DECREASE_NB_STARS BUTTON_REW |
164 | #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY | 164 | #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY |
165 | 165 | ||
166 | #endif | 166 | #endif |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 6bac97ea2a..1a2965fa89 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -226,8 +226,8 @@ | |||
226 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 226 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
227 | #define STOPWATCH_QUIT (BUTTON_REC|BUTTON_PLAY) | 227 | #define STOPWATCH_QUIT (BUTTON_REC|BUTTON_PLAY) |
228 | #define STOPWATCH_START_STOP BUTTON_PLAY | 228 | #define STOPWATCH_START_STOP BUTTON_PLAY |
229 | #define STOPWATCH_RESET_TIMER BUTTON_PREV | 229 | #define STOPWATCH_RESET_TIMER BUTTON_REW |
230 | #define STOPWATCH_LAP_TIMER BUTTON_NEXT | 230 | #define STOPWATCH_LAP_TIMER BUTTON_FF |
231 | #define STOPWATCH_SCROLL_UP BUTTON_VOL_UP | 231 | #define STOPWATCH_SCROLL_UP BUTTON_VOL_UP |
232 | #define STOPWATCH_SCROLL_DOWN BUTTON_VOL_DOWN | 232 | #define STOPWATCH_SCROLL_DOWN BUTTON_VOL_DOWN |
233 | 233 | ||
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index f943a9f5fc..c2ef1d6693 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -285,9 +285,9 @@ | |||
285 | #define SUDOKU_BUTTON_MENU BUTTON_REC | 285 | #define SUDOKU_BUTTON_MENU BUTTON_REC |
286 | #define SUDOKU_BUTTON_LEFT BUTTON_VOL_DOWN | 286 | #define SUDOKU_BUTTON_LEFT BUTTON_VOL_DOWN |
287 | #define SUDOKU_BUTTON_RIGHT BUTTON_VOL_UP | 287 | #define SUDOKU_BUTTON_RIGHT BUTTON_VOL_UP |
288 | #define SUDOKU_BUTTON_CHANGEDIR BUTTON_SELECT | 288 | #define SUDOKU_BUTTON_CHANGEDIR BUTTON_FUNC |
289 | #define SUDOKU_BUTTON_TOGGLE BUTTON_NEXT | 289 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FF |
290 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_PREV | 290 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_REW |
291 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 291 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
292 | 292 | ||
293 | #else | 293 | #else |
diff --git a/apps/plugins/test_grey.c b/apps/plugins/test_grey.c index 5931d96bd3..da199a6f14 100644 --- a/apps/plugins/test_grey.c +++ b/apps/plugins/test_grey.c | |||
@@ -86,8 +86,8 @@ | |||
86 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 86 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
87 | #define GREY_QUIT (BUTTON_REC|BUTTON_PLAY) | 87 | #define GREY_QUIT (BUTTON_REC|BUTTON_PLAY) |
88 | #define GREY_OK BUTTON_PLAY | 88 | #define GREY_OK BUTTON_PLAY |
89 | #define GREY_PREV BUTTON_PREV | 89 | #define GREY_PREV BUTTON_REW |
90 | #define GREY_NEXT BUTTON_NEXT | 90 | #define GREY_NEXT BUTTON_FF |
91 | #define GREY_UP BUTTON_VOL_UP | 91 | #define GREY_UP BUTTON_VOL_UP |
92 | #define GREY_DOWN BUTTON_VOL_DOWN | 92 | #define GREY_DOWN BUTTON_VOL_DOWN |
93 | 93 | ||
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index f22beb87ff..4d8d3c6241 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -69,8 +69,8 @@ | |||
69 | 69 | ||
70 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 70 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
71 | #define SCANRATE_DONE BUTTON_PLAY | 71 | #define SCANRATE_DONE BUTTON_PLAY |
72 | #define SCANRATE_FASTINC BUTTON_NEXT | 72 | #define SCANRATE_FASTINC BUTTON_FF |
73 | #define SCANRATE_FASTDEC BUTTON_PREV | 73 | #define SCANRATE_FASTDEC BUTTON_REW |
74 | #define SCANRATE_INC BUTTON_VOL_UP | 74 | #define SCANRATE_INC BUTTON_VOL_UP |
75 | #define SCANRATE_DEC BUTTON_VOL_DOWN | 75 | #define SCANRATE_DEC BUTTON_VOL_DOWN |
76 | 76 | ||
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index 1ae92556b8..f0daa06d80 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -382,11 +382,11 @@ | |||
382 | /* MPIO HD200 keys */ | 382 | /* MPIO HD200 keys */ |
383 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 383 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
384 | #define TV_QUIT (BUTTON_REC | BUTTON_PLAY) | 384 | #define TV_QUIT (BUTTON_REC | BUTTON_PLAY) |
385 | #define TV_SCROLL_UP BUTTON_PREV | 385 | #define TV_SCROLL_UP BUTTON_REW |
386 | #define TV_SCROLL_DOWN BUTTON_NEXT | 386 | #define TV_SCROLL_DOWN BUTTON_FF |
387 | #define TV_SCREEN_LEFT BUTTON_VOL_DOWN | 387 | #define TV_SCREEN_LEFT BUTTON_VOL_DOWN |
388 | #define TV_SCREEN_RIGHT BUTTON_VOL_UP | 388 | #define TV_SCREEN_RIGHT BUTTON_VOL_UP |
389 | #define TV_MENU BUTTON_SELECT | 389 | #define TV_MENU BUTTON_FUNC |
390 | #define TV_AUTOSCROLL BUTTON_PLAY | 390 | #define TV_AUTOSCROLL BUTTON_PLAY |
391 | #define TV_BOOKMARK BUTTON_REC | 391 | #define TV_BOOKMARK BUTTON_REC |
392 | 392 | ||
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index f9ecf8ef33..4da4011181 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -286,12 +286,12 @@ | |||
286 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 286 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
287 | #define VUMETER_QUIT (BUTTON_REC|BUTTON_PLAY) | 287 | #define VUMETER_QUIT (BUTTON_REC|BUTTON_PLAY) |
288 | #define VUMETER_HELP BUTTON_PLAY | 288 | #define VUMETER_HELP BUTTON_PLAY |
289 | #define VUMETER_MENU BUTTON_SELECT | 289 | #define VUMETER_MENU BUTTON_FUNC |
290 | #define VUMETER_UP BUTTON_VOL_UP | 290 | #define VUMETER_UP BUTTON_VOL_UP |
291 | #define VUMETER_DOWN BUTTON_VOL_DOWN | 291 | #define VUMETER_DOWN BUTTON_VOL_DOWN |
292 | #define LABEL_HELP "PLAY" | 292 | #define LABEL_HELP "PLAY" |
293 | #define LABEL_QUIT "MENU" | 293 | #define LABEL_QUIT "MENU" |
294 | #define LABEL_MENU "SELECT" | 294 | #define LABEL_MENU "FUNC" |
295 | #define LABEL_VOLUME "UP/DOWN" | 295 | #define LABEL_VOLUME "UP/DOWN" |
296 | 296 | ||
297 | #else | 297 | #else |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 0c4e6f9e7a..155567958d 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -284,11 +284,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
284 | 284 | ||
285 | #define BTN_DIR_UP BUTTON_REC | 285 | #define BTN_DIR_UP BUTTON_REC |
286 | #define BTN_DIR_DOWN BUTTON_PLAY | 286 | #define BTN_DIR_DOWN BUTTON_PLAY |
287 | #define BTN_DIR_LEFT BUTTON_PREV | 287 | #define BTN_DIR_LEFT BUTTON_REW |
288 | #define BTN_DIR_RIGHT BUTTON_NEXT | 288 | #define BTN_DIR_RIGHT BUTTON_FF |
289 | #define BTN_STARTPAUSE BUTTON_SELECT | 289 | #define BTN_STARTPAUSE BUTTON_FUNC |
290 | #define BTN_QUIT (BUTTON_REC|BUTTON_PLAY) | 290 | #define BTN_QUIT (BUTTON_REC|BUTTON_PLAY) |
291 | #define BTN_STOPRESET (BUTTON_SELECT|BUTTON_REPEAT) | 291 | #define BTN_STOPRESET (BUTTON_FUNC|BUTTON_REPEAT) |
292 | 292 | ||
293 | #else | 293 | #else |
294 | #error No keymap defined! | 294 | #error No keymap defined! |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 11b16d2755..d20a703601 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -246,8 +246,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
246 | #define QUIT (BUTTON_REC|BUTTON_PLAY) | 246 | #define QUIT (BUTTON_REC|BUTTON_PLAY) |
247 | #define LEFT BUTTON_VOL_DOWN | 247 | #define LEFT BUTTON_VOL_DOWN |
248 | #define RIGHT BUTTON_VOL_UP | 248 | #define RIGHT BUTTON_VOL_UP |
249 | #define UP BUTTON_PREV | 249 | #define UP BUTTON_REW |
250 | #define DOWN BUTTON_NEXT | 250 | #define DOWN BUTTON_FF |
251 | #define PAUSE BUTTON_PLAY | 251 | #define PAUSE BUTTON_PLAY |
252 | 252 | ||
253 | #else | 253 | #else |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index ee2a8d5f4a..631350a9ae 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -192,9 +192,9 @@ | |||
192 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 192 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
193 | 193 | ||
194 | #define ZX_MENU (BUTTON_REC|BUTTON_PLAY) | 194 | #define ZX_MENU (BUTTON_REC|BUTTON_PLAY) |
195 | #define ZX_UP BUTTON_PREV | 195 | #define ZX_UP BUTTON_REW |
196 | #define ZX_DOWN BUTTON_NEXT | 196 | #define ZX_DOWN BUTTON_FF |
197 | #define ZX_SELECT BUTTON_SELECT | 197 | #define ZX_SELECT BUTTON_FUNC |
198 | #define ZX_LEFT BUTTON_VOL_DOWN | 198 | #define ZX_LEFT BUTTON_VOL_DOWN |
199 | #define ZX_RIGHT BUTTON_VOL_UP | 199 | #define ZX_RIGHT BUTTON_VOL_UP |
200 | 200 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index bc7e3aca2c..3a0f71e836 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -186,12 +186,12 @@ | |||
186 | 186 | ||
187 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 187 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
188 | 188 | ||
189 | #define KBD_SELECT BUTTON_SELECT | 189 | #define KBD_SELECT BUTTON_FUNC |
190 | #define KBD_ABORT BUTTON_REC | 190 | #define KBD_ABORT BUTTON_REC |
191 | #define KBD_LEFT BUTTON_VOL_DOWN | 191 | #define KBD_LEFT BUTTON_VOL_DOWN |
192 | #define KBD_RIGHT BUTTON_VOL_UP | 192 | #define KBD_RIGHT BUTTON_VOL_UP |
193 | #define KBD_UP BUTTON_PREV | 193 | #define KBD_UP BUTTON_REW |
194 | #define KBD_DOWN BUTTON_NEXT | 194 | #define KBD_DOWN BUTTON_FF |
195 | 195 | ||
196 | #endif | 196 | #endif |
197 | 197 | ||
diff --git a/firmware/target/coldfire/mpio/button-target.h b/firmware/target/coldfire/mpio/button-target.h index 6cfe758458..b7c31f8c59 100644 --- a/firmware/target/coldfire/mpio/button-target.h +++ b/firmware/target/coldfire/mpio/button-target.h | |||
@@ -36,30 +36,30 @@ int button_read_device(void); | |||
36 | /* Main unit's buttons - flags as in original firmware*/ | 36 | /* Main unit's buttons - flags as in original firmware*/ |
37 | #define BUTTON_PLAY 0x00000001 | 37 | #define BUTTON_PLAY 0x00000001 |
38 | 38 | ||
39 | #define BUTTON_PREV 0x00000004 | 39 | #define BUTTON_REW 0x00000004 |
40 | #define BUTTON_NEXT 0x00000002 | 40 | #define BUTTON_FF 0x00000002 |
41 | #define BUTTON_VOL_UP 0x00000008 | 41 | #define BUTTON_VOL_UP 0x00000008 |
42 | #define BUTTON_VOL_DOWN 0x00000010 | 42 | #define BUTTON_VOL_DOWN 0x00000010 |
43 | #define BUTTON_REC 0x00000020 | 43 | #define BUTTON_REC 0x00000020 |
44 | #define BUTTON_SELECT 0x00002000 | 44 | #define BUTTON_FUNC 0x00002000 |
45 | 45 | ||
46 | #define BUTTON_RC_PLAY 0x00010000 | 46 | #define BUTTON_RC_PLAY 0x00010000 |
47 | 47 | ||
48 | #define BUTTON_RC_PREV 0x00040000 | 48 | #define BUTTON_RC_REW 0x00040000 |
49 | #define BUTTON_RC_NEXT 0x00020000 | 49 | #define BUTTON_RC_FF 0x00020000 |
50 | #define BUTTON_RC_VOL_UP 0x00080000 | 50 | #define BUTTON_RC_VOL_UP 0x00080000 |
51 | #define BUTTON_RC_VOL_DOWN 0x00100000 | 51 | #define BUTTON_RC_VOL_DOWN 0x00100000 |
52 | #define BUTTON_RC_SELECT 0x20000000 | 52 | #define BUTTON_RC_FUNC 0x20000000 |
53 | 53 | ||
54 | #define BUTTON_LEFT BUTTON_PREV | 54 | #define BUTTON_LEFT BUTTON_REW |
55 | #define BUTTON_RIGHT BUTTON_NEXT | 55 | #define BUTTON_RIGHT BUTTON_FF |
56 | #define BUTTON_ON BUTTON_PLAY | 56 | #define BUTTON_ON BUTTON_PLAY |
57 | 57 | ||
58 | #define BUTTON_MAIN (BUTTON_PLAY|BUTTON_PREV|BUTTON_NEXT|BUTTON_VOL_UP|\ | 58 | #define BUTTON_MAIN (BUTTON_PLAY|BUTTON_REW|BUTTON_FF|BUTTON_VOL_UP|\ |
59 | BUTTON_VOL_DOWN|BUTTON_REC|BUTTON_SELECT) | 59 | BUTTON_VOL_DOWN|BUTTON_REC|BUTTON_FUNC) |
60 | 60 | ||
61 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_PREV|BUTTON_RC_NEXT|\ | 61 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_REW|BUTTON_RC_FF|\ |
62 | BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_SELECT) | 62 | BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_FUNC) |
63 | 63 | ||
64 | #define POWEROFF_BUTTON BUTTON_PLAY | 64 | #define POWEROFF_BUTTON BUTTON_PLAY |
65 | #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY | 65 | #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY |
diff --git a/firmware/target/coldfire/mpio/hd200/button-hd200.c b/firmware/target/coldfire/mpio/hd200/button-hd200.c index 65a996e7a5..93109ab209 100644 --- a/firmware/target/coldfire/mpio/hd200/button-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/button-hd200.c | |||
@@ -113,15 +113,15 @@ int button_read_device(void) | |||
113 | /* 1200 - 900 */ | 113 | /* 1200 - 900 */ |
114 | btn = BUTTON_VOL_UP; | 114 | btn = BUTTON_VOL_UP; |
115 | else /* 1600 - 1200 */ | 115 | else /* 1600 - 1200 */ |
116 | btn = BUTTON_NEXT; | 116 | btn = BUTTON_FF; |
117 | } | 117 | } |
118 | else /* 1600 - 2250 */ | 118 | else /* 1600 - 2250 */ |
119 | { | 119 | { |
120 | if (data < 1900) | 120 | if (data < 1900) |
121 | /* 1900 - 1600 */ | 121 | /* 1900 - 1600 */ |
122 | btn = BUTTON_PREV; | 122 | btn = BUTTON_REW; |
123 | else /* 1900 - 2300 */ | 123 | else /* 1900 - 2300 */ |
124 | btn = BUTTON_SELECT; | 124 | btn = BUTTON_FUNC; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -148,7 +148,7 @@ int button_read_device(void) | |||
148 | btn = BUTTON_RC_VOL_UP; | 148 | btn = BUTTON_RC_VOL_UP; |
149 | } | 149 | } |
150 | else /* 950 - 650 */ | 150 | else /* 950 - 650 */ |
151 | btn = BUTTON_RC_NEXT; | 151 | btn = BUTTON_RC_FF; |
152 | } | 152 | } |
153 | else /* 2050 - 950 */ | 153 | else /* 2050 - 950 */ |
154 | { | 154 | { |
@@ -156,10 +156,10 @@ int button_read_device(void) | |||
156 | { | 156 | { |
157 | if (data < 1350) | 157 | if (data < 1350) |
158 | /* 1350 - 900 */ | 158 | /* 1350 - 900 */ |
159 | btn = BUTTON_RC_PREV; | 159 | btn = BUTTON_RC_REW; |
160 | } | 160 | } |
161 | else /* 2050 - 1900 */ | 161 | else /* 2050 - 1900 */ |
162 | btn = BUTTON_RC_SELECT; | 162 | btn = BUTTON_RC_FUNC; |
163 | } | 163 | } |
164 | } | 164 | } |
165 | } | 165 | } |