summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES6
-rw-r--r--apps/keymaps/keymap-c100.c400
-rw-r--r--apps/keymaps/keymap-iaudio67.c330
-rw-r--r--apps/keymaps/keymap-logikdax.c318
-rw-r--r--apps/lang/english-us.lang6
-rw-r--r--apps/lang/english.lang6
-rw-r--r--apps/lang/italiano.lang6
-rw-r--r--apps/lang/nederlands.lang6
-rw-r--r--apps/lang/polski.lang6
-rw-r--r--apps/lang/russian.lang6
-rw-r--r--apps/lang/slovak.lang6
-rw-r--r--apps/lang/srpski.lang6
-rw-r--r--apps/plugins/battery_bench.c7
-rw-r--r--apps/plugins/calculator.c13
-rw-r--r--apps/plugins/chessclock.c11
-rw-r--r--apps/plugins/chopper.c6
-rw-r--r--apps/plugins/clix.c8
-rw-r--r--apps/plugins/cube.c10
-rw-r--r--apps/plugins/doom/i_video.c10
-rw-r--r--apps/plugins/imageviewer/imageviewer_button.h11
-rw-r--r--apps/plugins/invadrox.c7
-rw-r--r--apps/plugins/jewels.c10
-rw-r--r--apps/plugins/lib/pluginlib_actions.c15
-rw-r--r--apps/plugins/midi/midiplay.c8
-rw-r--r--apps/plugins/mp3_encoder.c6
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c8
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
-rw-r--r--apps/plugins/pacbox/pacbox.h12
-rw-r--r--apps/plugins/pictureflow/pictureflow.c8
-rw-r--r--apps/plugins/plugin.lds12
-rw-r--r--apps/plugins/pong.c8
-rw-r--r--apps/plugins/reversi/reversi-gui.h9
-rw-r--r--apps/plugins/rockblox.c11
-rw-r--r--apps/plugins/sokoban.c14
-rw-r--r--apps/plugins/stopwatch.c9
-rw-r--r--apps/plugins/sudoku/sudoku.h10
-rw-r--r--apps/plugins/text_viewer/tv_button.h12
-rw-r--r--apps/plugins/xobox.c9
-rw-r--r--apps/plugins/zxbox/keymaps.h8
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c9
40 files changed, 32 insertions, 1340 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 80133ebd27..6c13945904 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -231,12 +231,6 @@ keymaps/keymap-sa9200.c
231keymaps/keymap-hdd1630.c 231keymaps/keymap-hdd1630.c
232#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD 232#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
233keymaps/keymap-hdd6330.c 233keymaps/keymap-hdd6330.c
234#elif CONFIG_KEYPAD == IAUDIO67_PAD
235keymaps/keymap-iaudio67.c
236#elif CONFIG_KEYPAD == SANSA_C100_PAD
237keymaps/keymap-c100.c
238#elif CONFIG_KEYPAD == LOGIK_DAX_PAD
239keymaps/keymap-logikdax.c
240#elif CONFIG_KEYPAD == SANSA_FUZE_PAD 234#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
241keymaps/keymap-fuze.c 235keymaps/keymap-fuze.c
242#elif CONFIG_KEYPAD == ONDAVX747_PAD 236#elif CONFIG_KEYPAD == ONDAVX747_PAD
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c
deleted file mode 100644
index 9949f0c1c2..0000000000
--- a/apps/keymaps/keymap-c100.c
+++ /dev/null
@@ -1,400 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2007 Mark Arigo
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21/* Button Code Definitions for Sandisk c100 target */
22
23#include "config.h"
24#include "action.h"
25#include "button.h"
26#include "settings.h"
27
28/* {Action Code, Button code, Prereq button code } */
29
30/*
31 * The format of the list is as follows
32 * { Action Code, Button code, Prereq button code }
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
35 */
36static const struct button_mapping button_context_standard[] = {
37 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
38 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
39 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
40 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
41 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
42 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
43 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
44 { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
45 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
46 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
47
48 LAST_ITEM_IN_LIST
49}; /* button_context_standard */
50
51
52static const struct button_mapping button_context_wps[] = {
53 { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
54 { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
55 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
56 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
57 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
58
59 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
60 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
61 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL,BUTTON_RIGHT|BUTTON_REPEAT },
62
63 { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER },
64 { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
65 { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
66
67 { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
68 { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
69 { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT },
70 { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT },
71 { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
72 { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE },
73 { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
74
75 LAST_ITEM_IN_LIST
76}; /* button_context_wps */
77
78static const struct button_mapping button_context_settings[] = {
79 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
80 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
81 { ACTION_SETTINGS_INC, BUTTON_VOLUP, BUTTON_NONE },
82 { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
83 { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN, BUTTON_NONE },
84 { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
85 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
86 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
87 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
88 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
89
90 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
91}; /* button_context_settings */
92
93static const struct button_mapping button_context_list[] = {
94#ifdef HAVE_VOLUME_IN_LIST
95 { ACTION_LIST_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
96 { ACTION_LIST_VOLUP, BUTTON_VOLUP, BUTTON_NONE },
97 { ACTION_LIST_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE },
98 { ACTION_LIST_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
99#endif
100
101 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
102}; /* button_context_list */
103
104static const struct button_mapping button_context_tree[] = {
105 { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP },
106 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
107 { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE },
108
109 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
110}; /* button_context_tree */
111
112static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
113 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
114 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
115 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
116 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
117 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
118 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
119 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
120
121 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
122}; /* button_context_listtree_scroll_without_combo */
123
124static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
125// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
126// { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_REC|BUTTON_LEFT },
127// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
128// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
129// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
130
131 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
132}; /* button_context_listtree_scroll_with_combo */
133
134static const struct button_mapping button_context_yesno[] = {
135 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
136
137 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
138}; /* button_context_settings_yesno */
139
140static const struct button_mapping button_context_quickscreen[] = {
141 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
142 { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
143 { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
144 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
145 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
146 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
147 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
148 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
149 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
150
151 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
152}; /* button_context_quickscreen */
153
154static const struct button_mapping button_context_settings_right_is_inc[] = {
155 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
156 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
157 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
158 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
159 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
160
161 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
162}; /* button_context_settings_right_is_inc */
163
164static const struct button_mapping button_context_pitchscreen[] = {
165 { ACTION_PS_INC_SMALL, BUTTON_VOLUP, BUTTON_NONE },
166 { ACTION_PS_INC_BIG, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
167 { ACTION_PS_DEC_SMALL, BUTTON_VOLDOWN, BUTTON_NONE },
168 { ACTION_PS_DEC_BIG, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
169 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
170 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
171 { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
172 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
173 { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE },
174 { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE },
175 { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
176 { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
177
178 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
179}; /* button_context_pitchscreen */
180
181/** FM Radio Screen **/
182#if CONFIG_TUNER
183static const struct button_mapping button_context_radio[] = {
184 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
185 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
186 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
187 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
188 { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
189 { ACTION_FM_PRESET, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
190 { ACTION_FM_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
191 { ACTION_FM_MODE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
192 { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
193 { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
194
195 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
196}; /* button_context_radio */
197#endif
198
199static const struct button_mapping button_context_keyboard[] = {
200 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
201 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
202 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
203 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
204
205// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
206// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE },
207// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
208// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
209
210 { ACTION_KBD_UP, BUTTON_VOLUP, BUTTON_NONE },
211 { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
212 { ACTION_KBD_DOWN, BUTTON_VOLDOWN, BUTTON_NONE },
213 { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
214
215// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE },
216// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE },
217// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC },
218
219 { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE },
220 { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
221 { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE },
222
223 LAST_ITEM_IN_LIST
224}; /* button_context_keyboard */
225
226static const struct button_mapping button_context_bmark[] = {
227// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
228
229 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
230}; /* button_context_bmark */
231
232#ifdef USB_ENABLE_HID
233static const struct button_mapping button_context_usb_hid[] = {
234 { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
235 { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE },
236
237 LAST_ITEM_IN_LIST
238}; /* button_context_usb_hid */
239
240static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
241 { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_VOLUP, BUTTON_NONE },
242 { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
243 { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_VOLDOWN, BUTTON_NONE },
244 { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
245 { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
246 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP },
247 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
248 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
249 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
250
251 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
252}; /* button_context_usb_hid_mode_multimedia */
253
254static const struct button_mapping button_context_usb_hid_mode_presentation[] = {
255 { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_UP|BUTTON_REL, BUTTON_UP },
256 { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
257 { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
258 { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
259 { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
260 { ACTION_USB_HID_PRESENTATION_SLIDE_LAST, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
261 { ACTION_USB_HID_PRESENTATION_SCREEN_BLACK, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
262 { ACTION_USB_HID_PRESENTATION_SCREEN_WHITE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
263 { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_VOLUP, BUTTON_NONE },
264 { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
265 { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_VOLDOWN, BUTTON_NONE },
266 { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
267 { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
268 { ACTION_USB_HID_PRESENTATION_MOUSE_OVER, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
269
270 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
271}; /* button_context_usb_hid_mode_presentation */
272
273static const struct button_mapping button_context_usb_hid_mode_browser[] = {
274 { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_VOLUP, BUTTON_NONE },
275 { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
276 { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_VOLDOWN, BUTTON_NONE },
277 { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
278 { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP, BUTTON_UP|BUTTON_REL, BUTTON_UP },
279 { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
280 { ACTION_USB_HID_BROWSER_ZOOM_IN, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
281 { ACTION_USB_HID_BROWSER_ZOOM_OUT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
282 { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
283 { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_UP|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_UP|BUTTON_DOWN },
284 { ACTION_USB_HID_BROWSER_TAB_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
285 { ACTION_USB_HID_BROWSER_TAB_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
286 { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER },
287 { ACTION_USB_HID_BROWSER_HISTORY_BACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
288 { ACTION_USB_HID_BROWSER_HISTORY_FORWARD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
289 { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
290
291 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
292}; /* button_context_usb_hid_mode_browser */
293
294#ifdef HAVE_USB_HID_MOUSE
295static const struct button_mapping button_context_usb_hid_mode_mouse[] = {
296 { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE },
297 { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
298 { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE },
299 { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
300 { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE },
301 { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
302 { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
303 { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
304 { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE },
305 { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
306 { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE },
307 { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
308 { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE },
309 { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
310 { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE },
311 { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
312 { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE },
313 { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
314 { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE },
315 { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
316 { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE },
317 { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
318 { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE },
319 { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
320 { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE },
321 { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
322 { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE },
323 { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
324 { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_VOLUP, BUTTON_NONE },
325 { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
326 { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOLDOWN, BUTTON_NONE },
327 { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
328
329 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
330}; /* button_context_usb_hid_mode_mouse */
331#endif
332#endif
333
334/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
335const struct button_mapping* get_context_mapping(int context)
336{
337 switch (context)
338 {
339 case CONTEXT_STD:
340 return button_context_standard;
341
342 case CONTEXT_WPS:
343 return button_context_wps;
344
345 case CONTEXT_LIST:
346 return button_context_list;
347 case CONTEXT_TREE:
348 case CONTEXT_MAINMENU:
349 if (global_settings.hold_lr_for_scroll_in_list)
350 return button_context_listtree_scroll_without_combo;
351 else
352 return button_context_listtree_scroll_with_combo;
353 case CONTEXT_CUSTOM|CONTEXT_TREE:
354 return button_context_tree;
355
356 case CONTEXT_SETTINGS:
357 case CONTEXT_SETTINGS_TIME:
358 return button_context_settings;
359 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
360 case CONTEXT_SETTINGS_COLOURCHOOSER:
361 case CONTEXT_SETTINGS_EQ:
362 return button_context_settings_right_is_inc;
363
364 case CONTEXT_YESNOSCREEN:
365 return button_context_yesno;
366#if CONFIG_TUNER
367 case CONTEXT_FM:
368 return button_context_radio;
369#endif
370 case CONTEXT_BOOKMARKSCREEN:
371 return button_context_bmark;
372 case CONTEXT_QUICKSCREEN:
373 return button_context_quickscreen;
374 case CONTEXT_PITCHSCREEN:
375 return button_context_pitchscreen;
376#ifdef HAVE_RECORDING
377 case CONTEXT_RECSCREEN:
378 return button_context_recscreen;
379#endif
380 case CONTEXT_KEYBOARD:
381 return button_context_keyboard;
382#ifdef USB_ENABLE_HID
383 case CONTEXT_USB_HID:
384 return button_context_usb_hid;
385 case CONTEXT_USB_HID_MODE_MULTIMEDIA:
386 return button_context_usb_hid_mode_multimedia;
387 case CONTEXT_USB_HID_MODE_PRESENTATION:
388 return button_context_usb_hid_mode_presentation;
389 case CONTEXT_USB_HID_MODE_BROWSER:
390 return button_context_usb_hid_mode_browser;
391#ifdef HAVE_USB_HID_MOUSE
392 case CONTEXT_USB_HID_MODE_MOUSE:
393 return button_context_usb_hid_mode_mouse;
394#endif
395#endif
396 default:
397 return button_context_standard;
398 }
399 return button_context_standard;
400}
diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c
deleted file mode 100644
index 5c62a73dd0..0000000000
--- a/apps/keymaps/keymap-iaudio67.c
+++ /dev/null
@@ -1,330 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2007 Mark Arigo
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21/* Button Code Definitions for Iaudio[67] target */
22
23#include "config.h"
24#include "action.h"
25#include "button.h"
26#include "settings.h"
27
28/* {Action Code, Button code, Prereq button code } */
29
30/*
31 * The format of the list is as follows
32 * { Action Code, Button code, Prereq button code }
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
35 */
36static const struct button_mapping button_context_standard[] = {
37 { ACTION_STD_PREV, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
38 { ACTION_STD_PREVREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
39
40 { ACTION_STD_NEXT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
41 { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
42
43 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
44 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE },
45 { ACTION_STD_CANCEL, BUTTON_STOP|BUTTON_REL, BUTTON_NONE },
46 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
47
48 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
49 { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
50// { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_PLAY, BUTTON_NONE },
51
52 LAST_ITEM_IN_LIST
53}; /* button_context_standard */
54
55
56static const struct button_mapping button_context_wps[] = {
57
58 { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE },
59 { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
60 { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE },
61 { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
62 { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
63 { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
64
65 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
66 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
67 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
68
69 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
70 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
71 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
72
73 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
74#ifdef HAVE_HOTKEY
75 { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
76#else
77 { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
78#endif
79 { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE },
80
81 LAST_ITEM_IN_LIST
82}; /* button_context_wps */
83
84static const struct button_mapping button_context_settings[] = {
85 { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE },
86// { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
87
88 { ACTION_SETTINGS_INC, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
89 { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
90
91 { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE },
92 { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
93
94 { ACTION_STD_PREV, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
95 { ACTION_STD_PREVREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
96
97 { ACTION_STD_NEXT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
98 { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
99
100 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
101}; /* button_context_settings */
102
103static const struct button_mapping button_context_list[] = {
104#ifdef HAVE_VOLUME_IN_LIST
105 { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
106 { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REL, BUTTON_NONE },
107
108 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REL, BUTTON_NONE },
109 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
110#endif
111
112 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
113}; /* button_context_list */
114
115static const struct button_mapping button_context_tree[] = {
116 // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC },
117 // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP },
118#ifdef HAVE_HOTKEY
119 // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE },
120#endif
121
122 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
123}; /* button_context_tree */
124
125static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
126#if 0
127 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
128 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
129 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
130 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
131
132 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
133 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
134 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
135#endif
136 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
137}; /* button_context_listtree_scroll_without_combo */
138
139static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
140// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
141// { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_REC|BUTTON_LEFT },
142// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
143// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
144// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
145
146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
147}; /* button_context_listtree_scroll_with_combo */
148
149static const struct button_mapping button_context_yesno[] = {
150// { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
151
152 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
153}; /* button_context_settings_yesno */
154
155static const struct button_mapping button_context_quickscreen[] = {
156#if 0
157 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
158 { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
159
160 { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
161 { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
162
163 { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE },
164 { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
165
166 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
167 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
168
169 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
170 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
171#endif
172 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
173}; /* button_context_quickscreen */
174
175static const struct button_mapping button_context_settings_right_is_inc[] = {
176#if 0
177 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
178 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
179
180 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
181 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
182
183 { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE },
184#endif
185 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
186}; /* button_context_settings_right_is_inc */
187
188static const struct button_mapping button_context_pitchscreen[] = {
189#if 0
190 { ACTION_PS_INC_SMALL, BUTTON_VOLUP, BUTTON_NONE },
191 { ACTION_PS_INC_BIG, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
192
193 { ACTION_PS_DEC_SMALL, BUTTON_VOLDOWN, BUTTON_NONE },
194 { ACTION_PS_DEC_BIG, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
195
196 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
197 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
198
199 { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
200 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
201
202 { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE },
203 { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE },
204
205 { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
206 { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
207
208#endif
209 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
210}; /* button_context_pitchscreen */
211
212/** Recording Screen **/
213#ifdef HAVE_RECORDING
214static const struct button_mapping button_context_recscreen[] = {
215 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
216 { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
217 { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
218// { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
219
220 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
221 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
222 { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
223 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
224
225 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
226}; /* button_context_recscreen */
227#endif
228
229/** FM Radio Screen **/
230#if CONFIG_TUNER
231static const struct button_mapping button_context_radio[] = {
232 { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REL, BUTTON_MENU },
233 { ACTION_FM_MODE, BUTTON_MENU | BUTTON_REPEAT, BUTTON_MENU },
234 { ACTION_FM_PRESET, BUTTON_STOP, BUTTON_NONE },
235 { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_NONE },
236 { ACTION_FM_STOP, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_NONE },
237 { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE },
238
239 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
240}; /* button_context_radio */
241#endif
242
243static const struct button_mapping button_context_keyboard[] = {
244 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
245 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
246 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
247 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
248
249// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
250// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE },
251// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
252// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
253
254 { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
255 { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
256 { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE },
257 { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
258
259// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE },
260// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE },
261
262// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_PLAY, BUTTON_REC },
263
264 { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE },
265 { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
266 { ACTION_KBD_ABORT, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
267
268 LAST_ITEM_IN_LIST
269}; /* button_context_keyboard */
270
271static const struct button_mapping button_context_bmark[] = {
272// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
273
274 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
275}; /* button_context_bmark */
276
277/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
278const struct button_mapping* get_context_mapping(int context)
279{
280 switch (context)
281 {
282 case CONTEXT_STD:
283 return button_context_standard;
284 case CONTEXT_WPS:
285 return button_context_wps;
286
287 case CONTEXT_LIST:
288 return button_context_list;
289 case CONTEXT_TREE:
290 case CONTEXT_MAINMENU:
291 if (global_settings.hold_lr_for_scroll_in_list)
292 return button_context_listtree_scroll_without_combo;
293 else
294 return button_context_listtree_scroll_with_combo;
295 case CONTEXT_CUSTOM|CONTEXT_TREE:
296 return button_context_tree;
297
298 case CONTEXT_SETTINGS:
299 case CONTEXT_SETTINGS_TIME:
300 return button_context_settings;
301 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
302 case CONTEXT_SETTINGS_COLOURCHOOSER:
303 case CONTEXT_SETTINGS_EQ:
304 return button_context_settings_right_is_inc;
305
306 case CONTEXT_YESNOSCREEN:
307 return button_context_yesno;
308#if CONFIG_TUNER
309 case CONTEXT_FM:
310 return button_context_radio;
311#endif
312 case CONTEXT_BOOKMARKSCREEN:
313 return button_context_bmark;
314 case CONTEXT_QUICKSCREEN:
315 return button_context_quickscreen;
316 case CONTEXT_PITCHSCREEN:
317 return button_context_pitchscreen;
318#ifdef HAVE_RECORDING
319 case CONTEXT_RECSCREEN:
320 return button_context_recscreen;
321#endif
322 case CONTEXT_KEYBOARD:
323 return button_context_keyboard;
324
325 default:
326 return button_context_standard;
327 }
328
329 return button_context_standard;
330}
diff --git a/apps/keymaps/keymap-logikdax.c b/apps/keymaps/keymap-logikdax.c
deleted file mode 100644
index 20c23031ef..0000000000
--- a/apps/keymaps/keymap-logikdax.c
+++ /dev/null
@@ -1,318 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2008 Dave Chapman
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21/* Button Code Definitions for Sandisk c200 target */
22
23#include "config.h"
24#include "action.h"
25#include "button.h"
26#include "settings.h"
27
28/* {Action Code, Button code, Prereq button code } */
29
30/*
31 * The format of the list is as follows
32 * { Action Code, Button code, Prereq button code }
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
35 */
36static const struct button_mapping button_context_standard[] = {
37 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
38 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
39
40 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
41 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
42
43 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
44 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
45 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
46
47 { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
48 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
49// { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE },
50
51 LAST_ITEM_IN_LIST
52}; /* button_context_standard */
53
54
55static const struct button_mapping button_context_wps[] = {
56 { ACTION_WPS_PLAY, BUTTON_POWERPLAY|BUTTON_REL, BUTTON_POWERPLAY },
57 { ACTION_WPS_STOP, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY },
58
59 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
60 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
61 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
62
63 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
64 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
65 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
66
67 { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_MODE|BUTTON_RIGHT, BUTTON_MODE },
68 { ACTION_WPS_ABSETA_PREVDIR,BUTTON_MODE|BUTTON_LEFT, BUTTON_MODE },
69 { ACTION_WPS_ABRESET, BUTTON_MODE|BUTTON_UP, BUTTON_MODE },
70
71 { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
72 { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
73#if 0
74 { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT },
75 { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT },
76 { ACTION_WPS_CONTEXT, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_VOLDOWN },
77 { ACTION_WPS_QUICKSCREEN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_VOLDOWN },
78#endif
79
80 LAST_ITEM_IN_LIST
81}; /* button_context_wps */
82
83static const struct button_mapping button_context_settings[] = {
84 { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE },
85 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
86
87 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
88 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
89
90 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
91 { ACTION_SETTINGS_DECREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
92
93 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
94 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
95
96 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
97 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
98
99 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
100}; /* button_context_settings */
101
102static const struct button_mapping button_context_list[] = {
103 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
104}; /* button_context_list */
105
106static const struct button_mapping button_context_tree[] = {
107 // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC },
108 // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP },
109
110 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
111}; /* button_context_tree */
112
113static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
114 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
115 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
116 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
117 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
118
119 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
120 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
121 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
122
123 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
124}; /* button_context_listtree_scroll_without_combo */
125
126static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
127// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
128// { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_REC|BUTTON_LEFT },
129// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
130// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
131// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
132
133 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
134}; /* button_context_listtree_scroll_with_combo */
135
136static const struct button_mapping button_context_yesno[] = {
137 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
138
139 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
140}; /* button_context_settings_yesno */
141
142static const struct button_mapping button_context_quickscreen[] = {
143 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
144 { ACTION_STD_CANCEL, BUTTON_MODE|BUTTON_REL, BUTTON_NONE },
145
146 { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
147 { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
148
149 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
150 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
151
152 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
153 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
154
155 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
156 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
157
158 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
159}; /* button_context_quickscreen */
160
161static const struct button_mapping button_context_settings_right_is_inc[] = {
162 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
163 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
164
165 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
166 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
167
168 { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE },
169
170 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
171}; /* button_context_settings_right_is_inc */
172
173static const struct button_mapping button_context_pitchscreen[] = {
174 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
175 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
176
177 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
178 { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
179
180 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
181 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
182
183 { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
184 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
185
186 { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE },
187 { ACTION_PS_EXIT, BUTTON_MODE, BUTTON_NONE },
188
189 { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
190 { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
191
192 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
193}; /* button_context_pitchscreen */
194
195/** Recording Screen **/
196#ifdef HAVE_RECORDING
197static const struct button_mapping button_context_recscreen[] = {
198 { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
199 { ACTION_REC_PAUSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
200 { ACTION_STD_CANCEL, BUTTON_MODE|BUTTON_REPEAT, BUTTON_NONE },
201 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
202
203 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
204 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
205 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
206 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
207
208 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
209}; /* button_context_recscreen */
210#endif
211
212/** FM Radio Screen **/
213#if CONFIG_TUNER
214static const struct button_mapping button_context_radio[] = {
215 { ACTION_NONE, BUTTON_UP, BUTTON_NONE },
216 { ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE },
217 { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE },
218 { ACTION_FM_STOP, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY },
219 { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE },
220 { ACTION_FM_EXIT, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
221 { ACTION_FM_PLAY, BUTTON_POWERPLAY|BUTTON_REL, BUTTON_POWERPLAY },
222 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
223 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
224 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
225 { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
226
227 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
228}; /* button_context_radio */
229#endif
230
231static const struct button_mapping button_context_keyboard[] = {
232 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
233 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
234 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
235 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
236
237// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
238// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE },
239// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
240// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
241
242 { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE },
243 { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
244 { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE },
245 { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
246
247// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE },
248// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE },
249
250// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC },
251
252 { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE },
253 { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
254 { ACTION_KBD_ABORT, BUTTON_MODE, BUTTON_NONE },
255
256 LAST_ITEM_IN_LIST
257}; /* button_context_keyboard */
258
259static const struct button_mapping button_context_bmark[] = {
260// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
261
262 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
263}; /* button_context_bmark */
264
265/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
266const struct button_mapping* get_context_mapping(int context)
267{
268 switch (context)
269 {
270 case CONTEXT_STD:
271 return button_context_standard;
272
273 case CONTEXT_WPS:
274 return button_context_wps;
275
276 case CONTEXT_LIST:
277 return button_context_list;
278 case CONTEXT_TREE:
279 case CONTEXT_MAINMENU:
280 if (global_settings.hold_lr_for_scroll_in_list)
281 return button_context_listtree_scroll_without_combo;
282 else
283 return button_context_listtree_scroll_with_combo;
284 case CONTEXT_CUSTOM|CONTEXT_TREE:
285 return button_context_tree;
286
287 case CONTEXT_SETTINGS:
288 case CONTEXT_SETTINGS_TIME:
289 return button_context_settings;
290 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
291 case CONTEXT_SETTINGS_COLOURCHOOSER:
292 case CONTEXT_SETTINGS_EQ:
293 return button_context_settings_right_is_inc;
294
295 case CONTEXT_YESNOSCREEN:
296 return button_context_yesno;
297#if CONFIG_TUNER
298 case CONTEXT_FM:
299 return button_context_radio;
300#endif
301 case CONTEXT_BOOKMARKSCREEN:
302 return button_context_bmark;
303 case CONTEXT_QUICKSCREEN:
304 return button_context_quickscreen;
305 case CONTEXT_PITCHSCREEN:
306 return button_context_pitchscreen;
307#ifdef HAVE_RECORDING
308 case CONTEXT_RECSCREEN:
309 return button_context_recscreen;
310#endif
311 case CONTEXT_KEYBOARD:
312 return button_context_keyboard;
313
314 default:
315 return button_context_standard;
316 }
317 return button_context_standard;
318}
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 8ddf4a82d0..b0afe443fb 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -15080,7 +15080,7 @@
15080 <source> 15080 <source>
15081 *: "Press LEFT to cancel." 15081 *: "Press LEFT to cancel."
15082 android,hifietma*,zenvision: "Press BACK to cancel." 15082 android,hifietma*,zenvision: "Press BACK to cancel."
15083 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15083 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15084 ihifi760,ihifi960: "Double tap RETURN to cancel." 15084 ihifi760,ihifi960: "Double tap RETURN to cancel."
15085 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15085 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15086 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15086 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15095,7 +15095,7 @@
15095 <dest> 15095 <dest>
15096 *: "Press LEFT to cancel." 15096 *: "Press LEFT to cancel."
15097 android,hifietma*,zenvision: "Press BACK to cancel." 15097 android,hifietma*,zenvision: "Press BACK to cancel."
15098 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15098 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15099 ihifi760,ihifi960: "Double tap RETURN to cancel." 15099 ihifi760,ihifi960: "Double tap RETURN to cancel."
15100 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15100 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15101 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15101 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15110,7 +15110,7 @@
15110 <voice> 15110 <voice>
15111 *: "Press LEFT to cancel." 15111 *: "Press LEFT to cancel."
15112 android,hifietma*,zenvision: "Press BACK to cancel." 15112 android,hifietma*,zenvision: "Press BACK to cancel."
15113 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15113 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15114 ihifi760,ihifi960: "Double tap RETURN to cancel." 15114 ihifi760,ihifi960: "Double tap RETURN to cancel."
15115 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15115 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15116 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15116 iriverh10,samsungyh*: "Double tap LEFT to cancel."
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 9ca4c84430..fd90817130 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -15239,7 +15239,7 @@
15239 <source> 15239 <source>
15240 *: "Press LEFT to cancel." 15240 *: "Press LEFT to cancel."
15241 android,hifietma*,zenvision: "Press BACK to cancel." 15241 android,hifietma*,zenvision: "Press BACK to cancel."
15242 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15242 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15243 ihifi760,ihifi960: "Double tap RETURN to cancel." 15243 ihifi760,ihifi960: "Double tap RETURN to cancel."
15244 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15244 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15245 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15245 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15254,7 +15254,7 @@
15254 <dest> 15254 <dest>
15255 *: "Press LEFT to cancel." 15255 *: "Press LEFT to cancel."
15256 android,hifietma*,zenvision: "Press BACK to cancel." 15256 android,hifietma*,zenvision: "Press BACK to cancel."
15257 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15257 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15258 ihifi760,ihifi960: "Double tap RETURN to cancel." 15258 ihifi760,ihifi960: "Double tap RETURN to cancel."
15259 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15259 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15260 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15260 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15269,7 +15269,7 @@
15269 <voice> 15269 <voice>
15270 *: "Press LEFT to cancel." 15270 *: "Press LEFT to cancel."
15271 android,hifietma*,zenvision: "Press BACK to cancel." 15271 android,hifietma*,zenvision: "Press BACK to cancel."
15272 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15272 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15273 ihifi760,ihifi960: "Double tap RETURN to cancel." 15273 ihifi760,ihifi960: "Double tap RETURN to cancel."
15274 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15274 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15275 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15275 iriverh10,samsungyh*: "Double tap LEFT to cancel."
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index dc8cd4be1d..559b53127d 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -15031,7 +15031,7 @@
15031 <source> 15031 <source>
15032 *: "Press LEFT to cancel." 15032 *: "Press LEFT to cancel."
15033 android,hifietma*,zenvision: "Press BACK to cancel." 15033 android,hifietma*,zenvision: "Press BACK to cancel."
15034 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15034 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15035 ihifi760,ihifi960: "Double tap RETURN to cancel." 15035 ihifi760,ihifi960: "Double tap RETURN to cancel."
15036 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15036 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15037 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15037 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15046,7 +15046,7 @@
15046 <dest> 15046 <dest>
15047 *: "Premere LEFT per annullare." 15047 *: "Premere LEFT per annullare."
15048 android,hifietma*,zenvision: "Premere BACK per annullare." 15048 android,hifietma*,zenvision: "Premere BACK per annullare."
15049 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare." 15049 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare."
15050 ihifi760,ihifi960: "Premere due volte RETURN per annullare." 15050 ihifi760,ihifi960: "Premere due volte RETURN per annullare."
15051 ihifi770,ihifi770c,ihifi800: "Premere HOME per annullare." 15051 ihifi770,ihifi770c,ihifi800: "Premere HOME per annullare."
15052 iriverh10,samsungyh*: "Premere due volte LEFT per annullare." 15052 iriverh10,samsungyh*: "Premere due volte LEFT per annullare."
@@ -15061,7 +15061,7 @@
15061 <voice> 15061 <voice>
15062 *: "Premere LEFT per annullare." 15062 *: "Premere LEFT per annullare."
15063 android,hifietma*,zenvision: "Premere BACK per annullare." 15063 android,hifietma*,zenvision: "Premere BACK per annullare."
15064 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare." 15064 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare."
15065 ihifi760,ihifi960: "Premere due volte RETURN per annullare." 15065 ihifi760,ihifi960: "Premere due volte RETURN per annullare."
15066 ihifi770,ihifi770c,ihifi800: "Premere HOME per annullare." 15066 ihifi770,ihifi770c,ihifi800: "Premere HOME per annullare."
15067 iriverh10,samsungyh*: "Premere due volte LEFT per annullare." 15067 iriverh10,samsungyh*: "Premere due volte LEFT per annullare."
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index a6a68ed1e6..3e7abc613d 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -15104,7 +15104,7 @@
15104 <source> 15104 <source>
15105 *: "Press LEFT to cancel." 15105 *: "Press LEFT to cancel."
15106 android,hifietma*,zenvision: "Press BACK to cancel." 15106 android,hifietma*,zenvision: "Press BACK to cancel."
15107 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15107 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15108 ihifi760,ihifi960: "Double tap RETURN to cancel." 15108 ihifi760,ihifi960: "Double tap RETURN to cancel."
15109 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15109 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15110 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15110 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15120,7 +15120,7 @@
15120 *: "Druk op LINKS om te annuleren." 15120 *: "Druk op LINKS om te annuleren."
15121 android: "Druk op RECHTS om te annuleren." 15121 android: "Druk op RECHTS om te annuleren."
15122 hifietma*,zenvision: "Druk op BACK om te annuleren." 15122 hifietma*,zenvision: "Druk op BACK om te annuleren."
15123 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren." 15123 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren."
15124 ihifi760,ihifi960: "Dubbeltik op RETURN om te annuleren." 15124 ihifi760,ihifi960: "Dubbeltik op RETURN om te annuleren."
15125 ihifi770,ihifi770c,ihifi800: "Druk op HOME om te annuleren." 15125 ihifi770,ihifi770c,ihifi800: "Druk op HOME om te annuleren."
15126 iriverh10,samsungyh*: "Dubbeltik op LINKS om te annuleren." 15126 iriverh10,samsungyh*: "Dubbeltik op LINKS om te annuleren."
@@ -15136,7 +15136,7 @@
15136 *: "Druk op LINKS om te annuleren." 15136 *: "Druk op LINKS om te annuleren."
15137 android: "Druk op RECHTS om te annuleren." 15137 android: "Druk op RECHTS om te annuleren."
15138 hifietma*,zenvision: "Druk op BACK om te annuleren." 15138 hifietma*,zenvision: "Druk op BACK om te annuleren."
15139 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren." 15139 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren."
15140 ihifi760,ihifi960: "Dubbeltik op RETURN om te annuleren." 15140 ihifi760,ihifi960: "Dubbeltik op RETURN om te annuleren."
15141 ihifi770,ihifi770c,ihifi800: "Druk op HOME om te annuleren." 15141 ihifi770,ihifi770c,ihifi800: "Druk op HOME om te annuleren."
15142 iriverh10,samsungyh*: "Dubbeltik op LINKS om te annuleren." 15142 iriverh10,samsungyh*: "Dubbeltik op LINKS om te annuleren."
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 6832ccdc87..15f6915dd1 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -15038,7 +15038,7 @@
15038 <source> 15038 <source>
15039 *: "Press LEFT to cancel." 15039 *: "Press LEFT to cancel."
15040 android,hifietma*,zenvision: "Press BACK to cancel." 15040 android,hifietma*,zenvision: "Press BACK to cancel."
15041 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15041 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15042 ihifi760,ihifi960: "Double tap RETURN to cancel." 15042 ihifi760,ihifi960: "Double tap RETURN to cancel."
15043 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15043 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15044 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15044 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15053,7 +15053,7 @@
15053 <dest> 15053 <dest>
15054 *: "Wciśnij LEFT, aby anulować." 15054 *: "Wciśnij LEFT, aby anulować."
15055 android,hifietma*,zenvision: "Wciśnij BACK, aby anulować." 15055 android,hifietma*,zenvision: "Wciśnij BACK, aby anulować."
15056 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij POWER, aby anulować." 15056 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij POWER, aby anulować."
15057 ihifi760,ihifi960: "Podwójnie stuknij RETURN, aby anulować." 15057 ihifi760,ihifi960: "Podwójnie stuknij RETURN, aby anulować."
15058 ihifi770,ihifi770c,ihifi800: "Wciśnij HOME, aby anulować." 15058 ihifi770,ihifi770c,ihifi800: "Wciśnij HOME, aby anulować."
15059 iriverh10,samsungyh*: "Podwójnie stuknij LEFT, aby anulować." 15059 iriverh10,samsungyh*: "Podwójnie stuknij LEFT, aby anulować."
@@ -15068,7 +15068,7 @@
15068 <voice> 15068 <voice>
15069 *: "Wciśnij left, aby anulować." 15069 *: "Wciśnij left, aby anulować."
15070 android,hifietma*,zenvision: "Wciśnij bak, aby anulować." 15070 android,hifietma*,zenvision: "Wciśnij bak, aby anulować."
15071 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij pałer, aby anulować." 15071 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij pałer, aby anulować."
15072 ihifi760,ihifi960: "Podwójnie stuknij ritern, aby anulować." 15072 ihifi760,ihifi960: "Podwójnie stuknij ritern, aby anulować."
15073 ihifi770,ihifi770c,ihifi800: "Wciśnij hołm, aby anulować." 15073 ihifi770,ihifi770c,ihifi800: "Wciśnij hołm, aby anulować."
15074 iriverh10,samsungyh*: "Podwójnie stuknij left, aby anulować." 15074 iriverh10,samsungyh*: "Podwójnie stuknij left, aby anulować."
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 6364c71c0b..9d71ad819c 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -15161,7 +15161,7 @@
15161 <source> 15161 <source>
15162 *: "Press LEFT to cancel." 15162 *: "Press LEFT to cancel."
15163 android,hifietma*,zenvision: "Press BACK to cancel." 15163 android,hifietma*,zenvision: "Press BACK to cancel."
15164 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15164 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15165 ihifi760,ihifi960: "Double tap RETURN to cancel." 15165 ihifi760,ihifi960: "Double tap RETURN to cancel."
15166 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15166 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15167 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15167 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15176,7 +15176,7 @@
15176 <dest> 15176 <dest>
15177 *: "Нажмите ВЛЕВО для отмены." 15177 *: "Нажмите ВЛЕВО для отмены."
15178 android,hifietma*,zenvision: "Нажмите НАЗАД для отмены." 15178 android,hifietma*,zenvision: "Нажмите НАЗАД для отмены."
15179 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите ВКЛ. для отмены." 15179 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите ВКЛ. для отмены."
15180 ihifi760,ihifi960: "Дважды нажмите ВОЗВРАТ для отмены." 15180 ihifi760,ihifi960: "Дважды нажмите ВОЗВРАТ для отмены."
15181 ihifi770,ihifi770c,ihifi800: "Нажмите ДОМОЙ для отмены." 15181 ihifi770,ihifi770c,ihifi800: "Нажмите ДОМОЙ для отмены."
15182 iriverh10,samsungyh*: "Дважды нажмите ВЛЕВО для отмены." 15182 iriverh10,samsungyh*: "Дважды нажмите ВЛЕВО для отмены."
@@ -15191,7 +15191,7 @@
15191 <voice> 15191 <voice>
15192 *: "Нажмите кнопку Влево для отмены." 15192 *: "Нажмите кнопку Влево для отмены."
15193 android,hifietma*,zenvision: "Нажмите кнопку Назад для отмены." 15193 android,hifietma*,zenvision: "Нажмите кнопку Назад для отмены."
15194 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите кнопку включения для отмены." 15194 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите кнопку включения для отмены."
15195 ihifi760,ihifi960: "Дважды нажмите кнопку Назад для отмены." 15195 ihifi760,ihifi960: "Дважды нажмите кнопку Назад для отмены."
15196 ihifi770,ihifi770c,ihifi800: "Нажмите кнопку Домой для отмены." 15196 ihifi770,ihifi770c,ihifi800: "Нажмите кнопку Домой для отмены."
15197 iriverh10,samsungyh*: "Дважды нажмите кнопку Влево для отмены." 15197 iriverh10,samsungyh*: "Дважды нажмите кнопку Влево для отмены."
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 65015a5990..00f98ecd35 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -15056,7 +15056,7 @@
15056 <source> 15056 <source>
15057 *: "Press LEFT to cancel." 15057 *: "Press LEFT to cancel."
15058 android,hifietma*,zenvision: "Press BACK to cancel." 15058 android,hifietma*,zenvision: "Press BACK to cancel."
15059 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15059 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15060 ihifi760,ihifi960: "Double tap RETURN to cancel." 15060 ihifi760,ihifi960: "Double tap RETURN to cancel."
15061 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15061 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15062 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15062 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15071,7 +15071,7 @@
15071 <dest> 15071 <dest>
15072 *: "Stlačte LEFT pre zrušenie" 15072 *: "Stlačte LEFT pre zrušenie"
15073 android: "Stlačte späť pre zrušenie" 15073 android: "Stlačte späť pre zrušenie"
15074 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie" 15074 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie"
15075 hifietma*,zenvision: "Stlačte BACK Pre zrušenie" 15075 hifietma*,zenvision: "Stlačte BACK Pre zrušenie"
15076 ihifi760,ihifi960: "Poklepte RETURN pre zrušenie" 15076 ihifi760,ihifi960: "Poklepte RETURN pre zrušenie"
15077 ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie" 15077 ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie"
@@ -15087,7 +15087,7 @@
15087 <voice> 15087 <voice>
15088 *: "Stlačte LEFT pre zrušenie" 15088 *: "Stlačte LEFT pre zrušenie"
15089 android: "Stlačte späť pre zrušenie" 15089 android: "Stlačte späť pre zrušenie"
15090 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie" 15090 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie"
15091 hifietma*,zenvision: "Stlačte BACK Pre zrušenie" 15091 hifietma*,zenvision: "Stlačte BACK Pre zrušenie"
15092 ihifi760,ihifi960: "Poklepte RETURN pre zrušenie" 15092 ihifi760,ihifi960: "Poklepte RETURN pre zrušenie"
15093 ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie" 15093 ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie"
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index db93124c8f..95063ca0c0 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -15318,7 +15318,7 @@
15318 <source> 15318 <source>
15319 *: "Press LEFT to cancel." 15319 *: "Press LEFT to cancel."
15320 android,hifietma*,zenvision: "Press BACK to cancel." 15320 android,hifietma*,zenvision: "Press BACK to cancel."
15321 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." 15321 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
15322 ihifi760,ihifi960: "Double tap RETURN to cancel." 15322 ihifi760,ihifi960: "Double tap RETURN to cancel."
15323 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." 15323 ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
15324 iriverh10,samsungyh*: "Double tap LEFT to cancel." 15324 iriverh10,samsungyh*: "Double tap LEFT to cancel."
@@ -15333,7 +15333,7 @@
15333 <dest> 15333 <dest>
15334 *: "Притисните LEFT за прекид." 15334 *: "Притисните LEFT за прекид."
15335 android,hifietma*,zenvision: "Притисните BACK за прекид." 15335 android,hifietma*,zenvision: "Притисните BACK за прекид."
15336 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид." 15336 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид."
15337 ihifi760,ihifi960: "Дупли тап RETURN за прекид." 15337 ihifi760,ihifi960: "Дупли тап RETURN за прекид."
15338 ihifi770,ihifi770c,ihifi800: "Притисните HOME за прекид." 15338 ihifi770,ihifi770c,ihifi800: "Притисните HOME за прекид."
15339 iriverh10,samsungyh*: "Дупли тап LEFT за прекид." 15339 iriverh10,samsungyh*: "Дупли тап LEFT за прекид."
@@ -15348,7 +15348,7 @@
15348 <voice> 15348 <voice>
15349 *: "Притисните LEFT за прекид." 15349 *: "Притисните LEFT за прекид."
15350 android,hifietma*,zenvision: "Притисните BACK за прекид." 15350 android,hifietma*,zenvision: "Притисните BACK за прекид."
15351 cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид." 15351 cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид."
15352 ihifi760,ihifi960: "Дупли тап RETURN за прекид." 15352 ihifi760,ihifi960: "Дупли тап RETURN за прекид."
15353 ihifi770,ihifi770c,ihifi800: "Притисните HOME за прекид." 15353 ihifi770,ihifi770c,ihifi800: "Притисните HOME за прекид."
15354 iriverh10,samsungyh*: "Дупли тап LEFT за прекид." 15354 iriverh10,samsungyh*: "Дупли тап LEFT за прекид."
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index f8269f5c3b..d9c5eae516 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -141,13 +141,6 @@
141#define BATTERY_OFF BUTTON_POWER 141#define BATTERY_OFF BUTTON_POWER
142#define BATTERY_OFF_TXT "POWER" 142#define BATTERY_OFF_TXT "POWER"
143 143
144#elif CONFIG_KEYPAD == IAUDIO67_PAD
145
146#define BATTERY_OFF BUTTON_POWER
147#define BATTERY_OFF_TXT "POWER"
148#define BATTERY_ON BUTTON_PLAY
149#define BATTERY_ON_TXT "PLAY - start"
150
151#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 144#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
152#define BATTERY_ON BUTTON_PLAY 145#define BATTERY_ON BUTTON_PLAY
153#define BATTERY_ON_TXT "PLAY - start" 146#define BATTERY_ON_TXT "PLAY - start"
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 4d1b6fa594..ebf7098d65 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -269,19 +269,6 @@ F3: equal to "="
269#define CALCULATOR_QUIT BUTTON_POWER 269#define CALCULATOR_QUIT BUTTON_POWER
270#define CALCULATOR_CLEAR BUTTON_MENU 270#define CALCULATOR_CLEAR BUTTON_MENU
271 271
272#elif CONFIG_KEYPAD == IAUDIO67_PAD
273
274#define CALCULATOR_LEFT BUTTON_LEFT
275#define CALCULATOR_RIGHT BUTTON_RIGHT
276#define CALCULATOR_UP BUTTON_VOLUP
277#define CALCULATOR_DOWN BUTTON_VOLDOWN
278#define CALCULATOR_QUIT BUTTON_POWER
279#define CALCULATOR_INPUT BUTTON_PLAY
280#define CALCULATOR_CALC BUTTON_MENU
281#define CALCULATOR_CLEAR BUTTON_STOP
282
283#define CALCULATOR_RC_QUIT (BUTTON_MENU|BUTTON_PLAY)
284
285#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) 272#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
286 273
287#define CALCULATOR_LEFT BUTTON_LEFT 274#define CALCULATOR_LEFT BUTTON_LEFT
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 9a30dee984..79daf0987c 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -157,17 +157,6 @@
157#define CHC_SETTINGS_DEC BUTTON_MINUS 157#define CHC_SETTINGS_DEC BUTTON_MINUS
158#define CHC_SETTINGS_CANCEL BUTTON_POWER 158#define CHC_SETTINGS_CANCEL BUTTON_POWER
159 159
160#elif CONFIG_KEYPAD == IAUDIO67_PAD
161#define CHC_QUIT BUTTON_POWER
162#define CHC_STARTSTOP BUTTON_PLAY
163#define CHC_RESET BUTTON_LEFT
164#define CHC_MENU BUTTON_MENU
165#define CHC_SETTINGS_INC BUTTON_VOLUP
166#define CHC_SETTINGS_DEC BUTTON_VOLDOWN
167#define CHC_SETTINGS_OK BUTTON_PLAY
168#define CHC_SETTINGS_OK2 BUTTON_LEFT
169#define CHC_SETTINGS_CANCEL BUTTON_POWER
170
171#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 160#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
172#define CHC_QUIT BUTTON_BACK 161#define CHC_QUIT BUTTON_BACK
173#define CHC_STARTSTOP BUTTON_PLAY 162#define CHC_STARTSTOP BUTTON_PLAY
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index ab8f7b5540..70763a1b67 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -108,12 +108,6 @@ Still To do:
108#define QUIT BUTTON_POWER 108#define QUIT BUTTON_POWER
109#define ACTION2 BUTTON_PLUS 109#define ACTION2 BUTTON_PLUS
110 110
111#elif CONFIG_KEYPAD == IAUDIO67_PAD
112#define QUIT BUTTON_POWER
113#define ACTION BUTTON_PLAY
114#define ACTION2 BUTTON_STOP
115#define ACTIONTEXT "PLAY"
116
117#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 111#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
118#define QUIT BUTTON_BACK 112#define QUIT BUTTON_BACK
119#define ACTION BUTTON_UP 113#define ACTION BUTTON_UP
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index f1f21f6312..c127a300f2 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -100,14 +100,6 @@
100#define CLIX_BUTTON_UP BUTTON_SCROLL_UP 100#define CLIX_BUTTON_UP BUTTON_SCROLL_UP
101#define CLIX_BUTTON_DOWN BUTTON_SCROLL_DOWN 101#define CLIX_BUTTON_DOWN BUTTON_SCROLL_DOWN
102 102
103#elif CONFIG_KEYPAD == IAUDIO67_PAD
104#define CLIX_BUTTON_QUIT BUTTON_POWER
105#define CLIX_BUTTON_LEFT BUTTON_LEFT
106#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
107#define CLIX_BUTTON_CLICK BUTTON_PLAY
108#define CLIX_BUTTON_UP BUTTON_STOP
109#define CLIX_BUTTON_DOWN BUTTON_PLAY
110
111#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD 103#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
112#define CLIX_BUTTON_QUIT BUTTON_POWER 104#define CLIX_BUTTON_QUIT BUTTON_POWER
113#define CLIX_BUTTON_LEFT BUTTON_LEFT 105#define CLIX_BUTTON_LEFT BUTTON_LEFT
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 6587fdcb65..cb9d67ec35 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -171,16 +171,6 @@
171#elif CONFIG_KEYPAD == COWON_D2_PAD 171#elif CONFIG_KEYPAD == COWON_D2_PAD
172#define CUBE_QUIT BUTTON_POWER 172#define CUBE_QUIT BUTTON_POWER
173 173
174#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
175#define CUBE_QUIT BUTTON_POWER
176#define CUBE_NEXT BUTTON_RIGHT
177#define CUBE_PREV BUTTON_LEFT
178#define CUBE_INC BUTTON_VOLUP
179#define CUBE_DEC BUTTON_VOLDOWN
180#define CUBE_MODE BUTTON_MENU
181#define CUBE_PAUSE BUTTON_PLAY
182#define CUBE_HIGHSPEED BUTTON_STOP
183
184#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 174#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
185#define CUBE_QUIT BUTTON_BACK 175#define CUBE_QUIT BUTTON_BACK
186#define CUBE_NEXT BUTTON_RIGHT 176#define CUBE_NEXT BUTTON_RIGHT
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index bb04194acc..2381a7614d 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -316,16 +316,6 @@ void I_ShutdownGraphics(void)
316#define DOOMBUTTON_ENTER BUTTON_MENU 316#define DOOMBUTTON_ENTER BUTTON_MENU
317#define DOOMBUTTON_WEAPON BUTTON_DISPLAY 317#define DOOMBUTTON_WEAPON BUTTON_DISPLAY
318 318
319#elif CONFIG_KEYPAD == IAUDIO67_PAD
320#define DOOMBUTTON_ESC BUTTON_POWER
321#define DOOMBUTTON_UP BUTTON_STOP
322#define DOOMBUTTON_DOWN BUTTON_PLAY
323#define DOOMBUTTON_LEFT BUTTON_LEFT
324#define DOOMBUTTON_RIGHT BUTTON_RIGHT
325#define DOOMBUTTON_SHOOT BUTTON_VOLUP
326#define DOOMBUTTON_OPEN BUTTON_VOLDOWN
327#define DOOMBUTTON_ENTER BUTTON_MENU
328
329#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 319#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
330#define DOOMBUTTON_UP BUTTON_UP 320#define DOOMBUTTON_UP BUTTON_UP
331#define DOOMBUTTON_DOWN BUTTON_DOWN 321#define DOOMBUTTON_DOWN BUTTON_DOWN
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index cfb9a2969b..d588de95ca 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -207,17 +207,6 @@
207 207
208#elif CONFIG_KEYPAD == COWON_D2_PAD 208#elif CONFIG_KEYPAD == COWON_D2_PAD
209 209
210#elif CONFIG_KEYPAD == IAUDIO67_PAD
211#define IMGVIEW_ZOOM_IN BUTTON_VOLUP
212#define IMGVIEW_ZOOM_OUT BUTTON_VOLDOWN
213#define IMGVIEW_UP BUTTON_STOP
214#define IMGVIEW_DOWN BUTTON_PLAY
215#define IMGVIEW_LEFT BUTTON_LEFT
216#define IMGVIEW_RIGHT BUTTON_RIGHT
217#define IMGVIEW_NEXT (BUTTON_PLAY|BUTTON_VOLUP)
218#define IMGVIEW_PREVIOUS (BUTTON_PLAY|BUTTON_VOLDOWN)
219#define IMGVIEW_MENU BUTTON_MENU
220
221#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 210#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
222 211
223#define IMGVIEW_ZOOM_IN BUTTON_PLAY 212#define IMGVIEW_ZOOM_IN BUTTON_PLAY
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 8b0519d9d0..c28ab7e830 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -163,13 +163,6 @@
163#define RIGHT BUTTON_PLUS 163#define RIGHT BUTTON_PLUS
164#define FIRE BUTTON_MENU 164#define FIRE BUTTON_MENU
165 165
166#elif CONFIG_KEYPAD == IAUDIO67_PAD
167
168#define QUIT BUTTON_POWER
169#define LEFT BUTTON_LEFT
170#define RIGHT BUTTON_RIGHT
171#define FIRE BUTTON_PLAY
172
173#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 166#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
174 167
175#define QUIT BUTTON_BACK 168#define QUIT BUTTON_BACK
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 83a44eea02..af0189e9db 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -201,16 +201,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
201#define JEWELS_CANCEL BUTTON_POWER 201#define JEWELS_CANCEL BUTTON_POWER
202#define HK_CANCEL "POWER" 202#define HK_CANCEL "POWER"
203 203
204#elif CONFIG_KEYPAD == IAUDIO67_PAD
205#define JEWELS_UP BUTTON_STOP
206#define JEWELS_DOWN BUTTON_PLAY
207#define JEWELS_LEFT BUTTON_LEFT
208#define JEWELS_RIGHT BUTTON_RIGHT
209#define JEWELS_SELECT BUTTON_MENU
210#define JEWELS_CANCEL BUTTON_POWER
211#define HK_SELECT "MENU"
212#define HK_CANCEL "POWER"
213
214#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 204#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
215#define JEWELS_UP BUTTON_UP 205#define JEWELS_UP BUTTON_UP
216#define JEWELS_DOWN BUTTON_DOWN 206#define JEWELS_DOWN BUTTON_DOWN
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index b1bcd06ee6..907cb3ee42 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -161,15 +161,6 @@ const struct button_mapping pla_main_ctx[] =
161 { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 161 { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
162 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 162 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE },
163 { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 163 { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
164#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
165 { PLA_UP, BUTTON_STOP, BUTTON_NONE },
166 { PLA_DOWN, BUTTON_PLAY, BUTTON_NONE },
167 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE },
168 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
169 { PLA_UP_REPEAT, BUTTON_STOP|BUTTON_REPEAT, BUTTON_NONE },
170 { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
171 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
172 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
173#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) 164#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
174 { PLA_UP, BUTTON_UP, BUTTON_NONE}, 165 { PLA_UP, BUTTON_UP, BUTTON_NONE},
175 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, 166 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE},
@@ -394,12 +385,6 @@ const struct button_mapping pla_main_ctx[] =
394 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, 385 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
395 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, 386 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
396 {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, 387 {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
397#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
398 {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER},
399 {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE},
400 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
401 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
402 {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT BUTTON_NONE},
403#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) 388#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
404 {PLA_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, 389 {PLA_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK},
405 {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, 390 {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE},
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index f07cdd4dcf..a28d1d3862 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -140,14 +140,6 @@
140#elif CONFIG_KEYPAD == COWON_D2_PAD 140#elif CONFIG_KEYPAD == COWON_D2_PAD
141#define MIDI_QUIT BUTTON_POWER 141#define MIDI_QUIT BUTTON_POWER
142 142
143#elif CONFIG_KEYPAD == IAUDIO67_PAD
144#define MIDI_QUIT BUTTON_POWER
145#define MIDI_FFWD BUTTON_RIGHT
146#define MIDI_REWIND BUTTON_LEFT
147#define MIDI_VOL_UP BUTTON_STOP
148#define MIDI_VOL_DOWN BUTTON_PLAY
149#define MIDI_PLAYPAUSE BUTTON_MENU
150
151#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 143#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
152#define MIDI_QUIT BUTTON_BACK 144#define MIDI_QUIT BUTTON_BACK
153#define MIDI_FFWD BUTTON_RIGHT 145#define MIDI_FFWD BUTTON_RIGHT
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 7c5084529b..db10185c91 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2443,12 +2443,6 @@ static void get_mp3_filename(const char *wav_name)
2443#elif CONFIG_KEYPAD == COWON_D2_PAD 2443#elif CONFIG_KEYPAD == COWON_D2_PAD
2444#define MP3ENC_DONE BUTTON_POWER 2444#define MP3ENC_DONE BUTTON_POWER
2445 2445
2446#elif CONFIG_KEYPAD == IAUDIO67_PAD
2447#define MP3ENC_PREV BUTTON_LEFT
2448#define MP3ENC_NEXT BUTTON_RIGHT
2449#define MP3ENC_DONE BUTTON_POWER
2450#define MP3ENC_SELECT BUTTON_PLAY
2451
2452#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 2446#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
2453#define MP3ENC_PREV BUTTON_UP 2447#define MP3ENC_PREV BUTTON_UP
2454#define MP3ENC_NEXT BUTTON_DOWN 2448#define MP3ENC_NEXT BUTTON_DOWN
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index d59797eaa7..505f3aa33d 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -142,14 +142,6 @@ struct mpeg_settings settings;
142#elif CONFIG_KEYPAD == COWON_D2_PAD 142#elif CONFIG_KEYPAD == COWON_D2_PAD
143#define MPEG_START_TIME_EXIT BUTTON_POWER 143#define MPEG_START_TIME_EXIT BUTTON_POWER
144 144
145#elif CONFIG_KEYPAD == IAUDIO67_PAD
146#define MPEG_START_TIME_SELECT BUTTON_MENU
147#define MPEG_START_TIME_LEFT BUTTON_LEFT
148#define MPEG_START_TIME_RIGHT BUTTON_RIGHT
149#define MPEG_START_TIME_UP BUTTON_STOP
150#define MPEG_START_TIME_DOWN BUTTON_PLAY
151#define MPEG_START_TIME_EXIT BUTTON_POWER
152
153#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 145#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
154#define MPEG_START_TIME_SELECT BUTTON_SELECT 146#define MPEG_START_TIME_SELECT BUTTON_SELECT
155#define MPEG_START_TIME_LEFT BUTTON_LEFT 147#define MPEG_START_TIME_LEFT BUTTON_LEFT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 6b18e4fa3a..34eafd5d9c 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -254,15 +254,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
254#define MPEG_VOLDOWN BUTTON_MINUS 254#define MPEG_VOLDOWN BUTTON_MINUS
255#define MPEG_VOLUP BUTTON_PLUS 255#define MPEG_VOLUP BUTTON_PLUS
256 256
257#elif CONFIG_KEYPAD == IAUDIO67_PAD
258#define MPEG_MENU BUTTON_MENU
259#define MPEG_STOP BUTTON_STOP
260#define MPEG_PAUSE BUTTON_PLAY
261#define MPEG_VOLDOWN BUTTON_VOLDOWN
262#define MPEG_VOLUP BUTTON_VOLUP
263#define MPEG_RW BUTTON_LEFT
264#define MPEG_FF BUTTON_RIGHT
265
266#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 257#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
267#define MPEG_MENU BUTTON_MENU 258#define MPEG_MENU BUTTON_MENU
268#define MPEG_STOP BUTTON_BACK 259#define MPEG_STOP BUTTON_BACK
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index c1a1c6b9e5..a3d42b099c 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -169,18 +169,6 @@
169 169
170#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) 170#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL)
171 171
172#elif CONFIG_KEYPAD == IAUDIO67_PAD
173
174#define PACMAN_UP BUTTON_STOP
175#define PACMAN_DOWN BUTTON_PLAY
176#define PACMAN_LEFT BUTTON_LEFT
177#define PACMAN_RIGHT BUTTON_RIGHT
178#define PACMAN_1UP BUTTON_VOLDOWN
179#define PACMAN_2UP BUTTON_VOLUP
180#define PACMAN_COIN_PRE BUTTON_MENU
181#define PACMAN_COIN (BUTTON_MENU | BUTTON_PLAY)
182#define PACMAN_MENU BUTTON_POWER
183
184#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 172#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
185 173
186#define PACMAN_UP BUTTON_UP 174#define PACMAN_UP BUTTON_UP
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 42930f0ff6..8f59695127 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -103,10 +103,8 @@ const struct button_mapping pf_context_buttons[] =
103 {PF_SELECT, BUTTON_CENTER, BUTTON_NONE}, 103 {PF_SELECT, BUTTON_CENTER, BUTTON_NONE},
104 {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, 104 {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE},
105#endif 105#endif
106#if CONFIG_KEYPAD == SANSA_C100_PAD 106#if CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \
107 {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, 107 CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || \
108#elif CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \
109 CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \
110 CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \ 108 CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \
111 CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \ 109 CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \
112 CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \ 110 CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \
@@ -137,8 +135,6 @@ const struct button_mapping pf_context_buttons[] =
137 || (CONFIG_KEYPAD == IPOD_4G_PAD) \ 135 || (CONFIG_KEYPAD == IPOD_4G_PAD) \
138 || (CONFIG_KEYPAD == MPIO_HD300_PAD) 136 || (CONFIG_KEYPAD == MPIO_HD300_PAD)
139 {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, 137 {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU},
140#elif CONFIG_KEYPAD == LOGIK_DAX_PAD
141 {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY},
142#elif CONFIG_KEYPAD == IAUDIO_M3_PAD 138#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
143 {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, 139 {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE},
144#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD 140#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 5931b6b0a5..7033d023f3 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -54,7 +54,7 @@ OUTPUT_FORMAT(elf32-littlemips)
54#elif CONFIG_CPU==S3C2440 54#elif CONFIG_CPU==S3C2440
55#include "cpu.h" 55#include "cpu.h"
56/* must be 16Kb (0x4000) aligned */ 56/* must be 16Kb (0x4000) aligned */
57#define TTB_SIZE (0x4000) 57#define TTB_SIZE (0x4000)
58#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_BUFFER_SIZE - TTB_SIZE 58#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_BUFFER_SIZE - TTB_SIZE
59 59
60#elif CONFIG_CPU==TCC7801 60#elif CONFIG_CPU==TCC7801
@@ -127,7 +127,7 @@ OUTPUT_FORMAT(elf32-littlemips)
127/* The bit of IRAM that is available is used in the core */ 127/* The bit of IRAM that is available is used in the core */
128#define IRAMSIZE 0 128#define IRAMSIZE 0
129 129
130#elif defined(CPU_TCC780X) || defined(CPU_TCC77X) 130#elif defined(CPU_TCC780X)
131#define DRAMORIG 0x20000000 131#define DRAMORIG 0x20000000
132#if CONFIG_CPU==TCC7801 132#if CONFIG_CPU==TCC7801
133#define IRAMORIG 0x1000c000 133#define IRAMORIG 0x1000c000
@@ -272,7 +272,7 @@ SECTIONS
272 *(.idata) 272 *(.idata)
273#endif 273#endif
274 } > PLUGIN_RAM 274 } > PLUGIN_RAM
275 275
276#if NOCACHE_BASE != 0 276#if NOCACHE_BASE != 0
277 .ncdata . + NOCACHE_BASE : 277 .ncdata . + NOCACHE_BASE :
278 { 278 {
@@ -281,7 +281,7 @@ SECTIONS
281 . = ALIGN(CACHEALIGN_SIZE); 281 . = ALIGN(CACHEALIGN_SIZE);
282/* EABI currently needs these defined here, otherwise .iram and .bss can 282/* EABI currently needs these defined here, otherwise .iram and .bss can
283 sometimes have an incorrect load address, breaking codecs and plugins. */ 283 sometimes have an incorrect load address, breaking codecs and plugins. */
284 bssaddr = . - NOCACHE_BASE; 284 bssaddr = . - NOCACHE_BASE;
285#if defined(IRAMSIZE) && IRAMSIZE != 0 285#if defined(IRAMSIZE) && IRAMSIZE != 0
286 iramcopy = . - NOCACHE_BASE; 286 iramcopy = . - NOCACHE_BASE;
287#endif 287#endif
@@ -314,7 +314,7 @@ SECTIONS
314 *(COMMON) 314 *(COMMON)
315 . = ALIGN(0x4); 315 . = ALIGN(0x4);
316 } > PLUGIN_RAM 316 } > PLUGIN_RAM
317 317
318#if NOCACHE_BASE != 0 318#if NOCACHE_BASE != 0
319 .ncbss . + NOCACHE_BASE (NOLOAD) : 319 .ncbss . + NOCACHE_BASE (NOLOAD) :
320 { 320 {
@@ -354,7 +354,7 @@ SECTIONS
354 . = ALIGN(0x4); 354 . = ALIGN(0x4);
355 iend = .; 355 iend = .;
356 } > PLUGIN_IRAM 356 } > PLUGIN_IRAM
357 357
358 loadendaddr = MAX(plugin_end_addr, LOADADDR(.iram) + SIZEOF(.iram)); 358 loadendaddr = MAX(plugin_end_addr, LOADADDR(.iram) + SIZEOF(.iram));
359#else 359#else
360 loadendaddr = plugin_end_addr; 360 loadendaddr = plugin_end_addr;
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index b06789af6b..22484d0bc9 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -139,14 +139,6 @@
139#elif (CONFIG_KEYPAD == COWON_D2_PAD) 139#elif (CONFIG_KEYPAD == COWON_D2_PAD)
140#define PONG_QUIT BUTTON_POWER 140#define PONG_QUIT BUTTON_POWER
141 141
142#elif CONFIG_KEYPAD == IAUDIO67_PAD
143#define PONG_QUIT BUTTON_POWER
144#define PONG_PAUSE BUTTON_MENU
145#define PONG_LEFT_UP BUTTON_VOLUP
146#define PONG_LEFT_DOWN BUTTON_VOLDOWN
147#define PONG_RIGHT_UP BUTTON_RIGHT
148#define PONG_RIGHT_DOWN BUTTON_LEFT
149
150#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 142#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
151#define PONG_QUIT BUTTON_BACK 143#define PONG_QUIT BUTTON_BACK
152#define PONG_LEFT_UP BUTTON_UP 144#define PONG_LEFT_UP BUTTON_UP
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index fd60b23927..7e031e6103 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -136,15 +136,6 @@
136#define REVERSI_BUTTON_QUIT BUTTON_POWER 136#define REVERSI_BUTTON_QUIT BUTTON_POWER
137#define REVERSI_BUTTON_MENU BUTTON_MENU 137#define REVERSI_BUTTON_MENU BUTTON_MENU
138 138
139#elif CONFIG_KEYPAD == IAUDIO67_PAD
140#define REVERSI_BUTTON_QUIT BUTTON_POWER
141#define REVERSI_BUTTON_UP BUTTON_STOP
142#define REVERSI_BUTTON_DOWN BUTTON_PLAY
143#define REVERSI_BUTTON_LEFT BUTTON_LEFT
144#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
145#define REVERSI_BUTTON_MAKE_MOVE BUTTON_VOLUP
146#define REVERSI_BUTTON_MENU BUTTON_MENU
147
148#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 139#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
149#define REVERSI_BUTTON_QUIT BUTTON_BACK 140#define REVERSI_BUTTON_QUIT BUTTON_BACK
150#define REVERSI_BUTTON_UP BUTTON_UP 141#define REVERSI_BUTTON_UP BUTTON_UP
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 9c36f8f62f..e85c6a5eab 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -205,17 +205,6 @@
205#define ROCKBLOX_OFF BUTTON_POWER 205#define ROCKBLOX_OFF BUTTON_POWER
206#define ROCKBLOX_RESTART BUTTON_MENU 206#define ROCKBLOX_RESTART BUTTON_MENU
207 207
208#elif CONFIG_KEYPAD == IAUDIO67_PAD
209
210#define ROCKBLOX_OFF BUTTON_POWER
211#define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN
212#define ROCKBLOX_ROTATE_CW BUTTON_VOLUP
213#define ROCKBLOX_DOWN BUTTON_STOP
214#define ROCKBLOX_LEFT BUTTON_LEFT
215#define ROCKBLOX_RIGHT BUTTON_RIGHT
216#define ROCKBLOX_DROP BUTTON_PLAY
217#define ROCKBLOX_RESTART BUTTON_MENU
218
219#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 208#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
220#define ROCKBLOX_OFF BUTTON_BACK 209#define ROCKBLOX_OFF BUTTON_BACK
221#define ROCKBLOX_ROTATE_CCW BUTTON_UP 210#define ROCKBLOX_ROTATE_CCW BUTTON_UP
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 9d57d7428c..41c671a38c 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -312,20 +312,6 @@
312#define SOKOBAN_LEVEL_UP BUTTON_PLUS 312#define SOKOBAN_LEVEL_UP BUTTON_PLUS
313#define SOKOBAN_MENU_NAME "[MENU]" 313#define SOKOBAN_MENU_NAME "[MENU]"
314 314
315#elif CONFIG_KEYPAD == IAUDIO67_PAD
316#define SOKOBAN_LEFT BUTTON_LEFT
317#define SOKOBAN_RIGHT BUTTON_RIGHT
318#define SOKOBAN_UP BUTTON_STOP
319#define SOKOBAN_DOWN BUTTON_PLAY
320#define SOKOBAN_MENU BUTTON_MENU
321#define SOKOBAN_UNDO BUTTON_VOLDOWN
322#define SOKOBAN_REDO BUTTON_VOLUP
323#define SOKOBAN_PAUSE (BUTTON_MENU|BUTTON_LEFT)
324#define BUTTON_SAVE (BUTTON_MENU|BUTTON_PLAY)
325#define BUTTON_SAVE_NAME "MENU+PLAY"
326
327#define SOKOBAN_RC_MENU (BUTTON_MENU|BUTTON_STOP)
328
329#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 315#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
330#define SOKOBAN_LEFT BUTTON_LEFT 316#define SOKOBAN_LEFT BUTTON_LEFT
331#define SOKOBAN_RIGHT BUTTON_RIGHT 317#define SOKOBAN_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 5259d0d616..c5ecfd7a8a 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -133,15 +133,6 @@
133#elif CONFIG_KEYPAD == COWON_D2_PAD 133#elif CONFIG_KEYPAD == COWON_D2_PAD
134#define STOPWATCH_QUIT BUTTON_POWER 134#define STOPWATCH_QUIT BUTTON_POWER
135 135
136#elif CONFIG_KEYPAD == IAUDIO67_PAD
137#define STOPWATCH_QUIT BUTTON_MENU
138#define STOPWATCH_START_STOP BUTTON_PLAY
139#define STOPWATCH_RESET_TIMER BUTTON_STOP
140#define STOPWATCH_LAP_TIMER BUTTON_LEFT
141#define STOPWATCH_SCROLL_UP BUTTON_VOLUP
142#define STOPWATCH_SCROLL_DOWN BUTTON_VOLDOWN
143#define STOPWATCH_RC_QUIT BUTTON_POWER
144
145#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 136#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
146#define STOPWATCH_QUIT BUTTON_BACK 137#define STOPWATCH_QUIT BUTTON_BACK
147#define STOPWATCH_START_STOP BUTTON_PLAY 138#define STOPWATCH_START_STOP BUTTON_PLAY
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 6ee3eb33ee..1332a9a80f 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -181,16 +181,6 @@
181#define SUDOKU_BUTTON_QUIT BUTTON_POWER 181#define SUDOKU_BUTTON_QUIT BUTTON_POWER
182#define SUDOKU_BUTTON_MENU BUTTON_MENU 182#define SUDOKU_BUTTON_MENU BUTTON_MENU
183 183
184#elif CONFIG_KEYPAD == IAUDIO67_PAD
185#define SUDOKU_BUTTON_QUIT BUTTON_POWER
186#define SUDOKU_BUTTON_UP BUTTON_STOP
187#define SUDOKU_BUTTON_DOWN BUTTON_PLAY
188#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
189#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
190#define SUDOKU_BUTTON_TOGGLE BUTTON_VOLUP
191#define SUDOKU_BUTTON_MENU BUTTON_MENU
192#define SUDOKU_BUTTON_POSSIBLE BUTTON_VOLDOWN
193
194#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 184#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
195#define SUDOKU_BUTTON_QUIT BUTTON_BACK 185#define SUDOKU_BUTTON_QUIT BUTTON_BACK
196#define SUDOKU_BUTTON_UP BUTTON_UP 186#define SUDOKU_BUTTON_UP BUTTON_UP
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index bea8f829ef..26bfb7a464 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -247,18 +247,6 @@
247#define TV_SCROLL_DOWN BUTTON_PLUS 247#define TV_SCROLL_DOWN BUTTON_PLUS
248#define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS) 248#define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS)
249 249
250/* Cowon iAudio 7 keys */
251#elif CONFIG_KEYPAD == IAUDIO67_PAD
252#define TV_QUIT BUTTON_POWER
253#define TV_SCROLL_UP BUTTON_VOLUP
254#define TV_SCROLL_DOWN BUTTON_VOLDOWN
255#define TV_SCREEN_LEFT BUTTON_LEFT
256#define TV_SCREEN_RIGHT BUTTON_RIGHT
257#define TV_MENU BUTTON_MENU
258#define TV_AUTOSCROLL BUTTON_PLAY
259#define TV_RC_QUIT BUTTON_STOP
260#define TV_BOOKMARK (BUTTON_LEFT|BUTTON_PLAY)
261
262/* Creative Zen Vision:M keys */ 250/* Creative Zen Vision:M keys */
263#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 251#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
264#define TV_QUIT BUTTON_BACK 252#define TV_QUIT BUTTON_BACK
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 36aae071cb..cf959ad7f5 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -146,15 +146,6 @@
146 146
147#define QUIT BUTTON_POWER 147#define QUIT BUTTON_POWER
148 148
149#elif CONFIG_KEYPAD == IAUDIO67_PAD
150
151#define QUIT BUTTON_POWER
152#define LEFT BUTTON_LEFT
153#define RIGHT BUTTON_RIGHT
154#define UP BUTTON_STOP
155#define DOWN BUTTON_PLAY
156#define PAUSE BUTTON_MENU
157
158#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 149#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
159 150
160#define QUIT BUTTON_BACK 151#define QUIT BUTTON_BACK
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index dbebc3b1d9..1dcb9c9034 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -110,14 +110,6 @@
110#elif CONFIG_KEYPAD == COWON_D2_PAD 110#elif CONFIG_KEYPAD == COWON_D2_PAD
111#define ZX_MENU (BUTTON_MENU|BUTTON_REL) 111#define ZX_MENU (BUTTON_MENU|BUTTON_REL)
112 112
113#elif CONFIG_KEYPAD == IAUDIO67_PAD
114#define ZX_UP BUTTON_STOP
115#define ZX_DOWN BUTTON_PLAY
116#define ZX_LEFT BUTTON_LEFT
117#define ZX_RIGHT BUTTON_RIGHT
118#define ZX_SELECT BUTTON_VOLUP
119#define ZX_MENU BUTTON_MENU
120
121#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 113#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
122#define ZX_UP BUTTON_UP 114#define ZX_UP BUTTON_UP
123#define ZX_DOWN BUTTON_DOWN 115#define ZX_DOWN BUTTON_DOWN
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index 63f74c7664..1028836351 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -113,15 +113,6 @@
113 113
114#define KBD_ABORT BUTTON_POWER 114#define KBD_ABORT BUTTON_POWER
115 115
116#elif CONFIG_KEYPAD == IAUDIO67_PAD
117
118#define KBD_SELECT BUTTON_MENU
119#define KBD_ABORT BUTTON_POWER
120#define KBD_LEFT BUTTON_LEFT
121#define KBD_RIGHT BUTTON_RIGHT
122#define KBD_UP BUTTON_STOP
123#define KBD_DOWN BUTTON_PLAY
124
125#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 116#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
126 117
127#define KBD_SELECT BUTTON_SELECT 118#define KBD_SELECT BUTTON_SELECT
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 17:38:25 +0000