summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES2
-rw-r--r--apps/keymaps/keymap-iaudio67.c325
-rw-r--r--apps/plugins/battery_bench.c6
-rw-r--r--apps/plugins/lib/pluginlib_actions.c27
-rw-r--r--apps/plugins/plugin.lds2
5 files changed, 361 insertions, 1 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index c8371a71aa..419d24d7a8 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -198,4 +198,6 @@ keymaps/keymap-creativezv.c
198keymaps/keymap-sa9200.c 198keymaps/keymap-sa9200.c
199#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD 199#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
200keymaps/keymap-hdd1630.c 200keymaps/keymap-hdd1630.c
201#elif CONFIG_KEYPAD == IAUDIO67_PAD
202keymaps/keymap-iaudio67.c
201#endif 203#endif
diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c
new file mode 100644
index 0000000000..b97a5602c9
--- /dev/null
+++ b/apps/keymaps/keymap-iaudio67.c
@@ -0,0 +1,325 @@
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_NONE },
38 { ACTION_STD_PREVREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
39
40 { ACTION_STD_NEXT, BUTTON_LEFT, 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_NONE },
45 { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE },
46
47 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
48 { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
49// { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_PLAY, BUTTON_NONE },
50
51 LAST_ITEM_IN_LIST
52}; /* button_context_standard */
53
54
55static const struct button_mapping button_context_wps[] = {
56
57 { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE },
58 { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
59 { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE },
60 { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
61 { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
62 { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
63
64 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
65 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
66 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
67
68 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
69 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
70 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
71
72 { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE },
73
74 LAST_ITEM_IN_LIST
75}; /* button_context_wps */
76
77static const struct button_mapping button_context_settings[] = {
78 { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE },
79// { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
80
81 { ACTION_SETTINGS_INC, BUTTON_VOLUP, BUTTON_NONE },
82 { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
83
84 { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN, BUTTON_NONE },
85 { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
86
87 { ACTION_STD_PREV, BUTTON_RIGHT, BUTTON_NONE },
88 { ACTION_STD_PREVREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
89
90 { ACTION_STD_NEXT, BUTTON_LEFT, BUTTON_NONE },
91 { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
92
93 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
94}; /* button_context_settings */
95
96static const struct button_mapping button_context_list[] = {
97#ifdef HAVE_VOLUME_IN_LIST
98 { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
99 { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
100
101 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
102 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
103#endif
104
105 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
106}; /* button_context_list */
107
108static const struct button_mapping button_context_tree[] = {
109 // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC },
110 // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP },
111
112 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
113}; /* button_context_tree */
114
115static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
116#if 0
117 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
118 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
119 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
120 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
121 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
122
123 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
124 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
125 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
126 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
127#endif
128 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
129}; /* button_context_listtree_scroll_without_combo */
130
131static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
132// { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
133
134// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC },
135// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
136
137// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_REC },
138// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
139
140 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
141}; /* button_context_listtree_scroll_with_combo */
142
143static const struct button_mapping button_context_yesno[] = {
144// { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
145
146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
147}; /* button_context_settings_yesno */
148
149static const struct button_mapping button_context_quickscreen[] = {
150#if 0
151 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
152 { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
153
154 { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
155 { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
156
157 { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE },
158 { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
159
160 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
161 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
162
163 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
164 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
165#endif
166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
167}; /* button_context_quickscreen */
168
169static const struct button_mapping button_context_settings_right_is_inc[] = {
170#if 0
171 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
172 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
173
174 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
175 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
176
177 { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE },
178#endif
179 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
180}; /* button_context_settings_right_is_inc */
181
182static const struct button_mapping button_context_pitchscreen[] = {
183#if 0
184 { ACTION_PS_INC_SMALL, BUTTON_VOLUP, BUTTON_NONE },
185 { ACTION_PS_INC_BIG, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
186
187 { ACTION_PS_DEC_SMALL, BUTTON_VOLDOWN, BUTTON_NONE },
188 { ACTION_PS_DEC_BIG, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
189
190 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
191 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
192
193 { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
194 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
195
196 { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE },
197 { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE },
198#endif
199 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
200}; /* button_context_pitchscreen */
201
202/** Recording Screen **/
203#ifdef HAVE_RECORDING
204static const struct button_mapping button_context_recscreen[] = {
205 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
206 { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
207 { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
208// { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
209
210 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
211 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
212 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
213 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
214
215 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
216}; /* button_context_recscreen */
217#endif
218
219/** FM Radio Screen **/
220#if CONFIG_TUNER
221static const struct button_mapping button_context_radio[] = {
222 { ACTION_NONE, BUTTON_VOLUP, BUTTON_NONE },
223 { ACTION_FM_MENU, BUTTON_VOLDOWN, BUTTON_NONE },
224 { ACTION_FM_PRESET, BUTTON_PLAY, BUTTON_NONE },
225 { ACTION_FM_STOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_VOLUP },
226// { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE },
227 { ACTION_FM_EXIT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
228 { ACTION_FM_PLAY, BUTTON_VOLUP|BUTTON_REL, BUTTON_VOLUP },
229 { ACTION_SETTINGS_INC, BUTTON_LEFT, BUTTON_NONE },
230 { ACTION_SETTINGS_INCREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
231 { ACTION_SETTINGS_DEC, BUTTON_RIGHT, BUTTON_NONE },
232 { ACTION_SETTINGS_DECREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
233
234 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
235}; /* button_context_radio */
236#endif
237
238static const struct button_mapping button_context_keyboard[] = {
239 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
240 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
241 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
242 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
243
244// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
245// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE },
246// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
247// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
248
249 { ACTION_KBD_UP, BUTTON_VOLUP, BUTTON_NONE },
250 { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
251 { ACTION_KBD_DOWN, BUTTON_VOLDOWN, BUTTON_NONE },
252 { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
253
254// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE },
255// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE },
256
257// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_PLAY, BUTTON_REC },
258
259 { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE },
260 { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
261 { ACTION_KBD_ABORT, BUTTON_MENU, BUTTON_NONE },
262
263 LAST_ITEM_IN_LIST
264}; /* button_context_keyboard */
265
266static const struct button_mapping button_context_bmark[] = {
267// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
268
269 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
270}; /* button_context_bmark */
271
272/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
273const struct button_mapping* get_context_mapping(int context)
274{
275 switch (context)
276 {
277 case CONTEXT_STD:
278 return button_context_standard;
279
280 case CONTEXT_WPS:
281 return button_context_wps;
282
283 case CONTEXT_LIST:
284 return button_context_list;
285 case CONTEXT_TREE:
286 case CONTEXT_MAINMENU:
287 if (global_settings.hold_lr_for_scroll_in_list)
288 return button_context_listtree_scroll_without_combo;
289 else
290 return button_context_listtree_scroll_with_combo;
291 case CONTEXT_CUSTOM|CONTEXT_TREE:
292 return button_context_tree;
293
294 case CONTEXT_SETTINGS:
295 case CONTEXT_SETTINGS_TIME:
296 return button_context_settings;
297 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
298 case CONTEXT_SETTINGS_COLOURCHOOSER:
299 case CONTEXT_SETTINGS_EQ:
300 return button_context_settings_right_is_inc;
301
302 case CONTEXT_YESNOSCREEN:
303 return button_context_yesno;
304#if CONFIG_TUNER
305 case CONTEXT_FM:
306 return button_context_radio;
307#endif
308 case CONTEXT_BOOKMARKSCREEN:
309 return button_context_bmark;
310 case CONTEXT_QUICKSCREEN:
311 return button_context_quickscreen;
312 case CONTEXT_PITCHSCREEN:
313 return button_context_pitchscreen;
314#ifdef HAVE_RECORDING
315 case CONTEXT_RECSCREEN:
316 return button_context_recscreen;
317#endif
318 case CONTEXT_KEYBOARD:
319 return button_context_keyboard;
320
321 default:
322 return button_context_standard;
323 }
324 return button_context_standard;
325}
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 4361bbc491..44e7ad7bec 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -150,6 +150,12 @@ PLUGIN_HEADER
150#define BATTERY_OFF BUTTON_POWER 150#define BATTERY_OFF BUTTON_POWER
151#define BATTERY_OFF_TXT "POWER - quit" 151#define BATTERY_OFF_TXT "POWER - quit"
152 152
153#elif CONFIG_KEYPAD == IAUDIO67_PAD
154
155#define BATTERY_OFF BUTTON_POWER
156#define BATTERY_OFF_TXT "POWER - quit"
157#define BATTERY_ON BUTTON_PLAY
158#define BATTERY_ON_TXT "PLAY - start"
153#else 159#else
154#error No keymap defined! 160#error No keymap defined!
155#endif 161#endif
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index a6bf28302f..26ef590522 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -154,6 +154,15 @@ const struct button_mapping generic_directions[] =
154 { PLA_DOWN_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, 154 { PLA_DOWN_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
155 { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, 155 { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE},
156 { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, 156 { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
157#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
158 { PLA_UP, BUTTON_STOP, BUTTON_NONE},
159 { PLA_DOWN, BUTTON_PLAY, BUTTON_NONE},
160 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
161 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
162 { PLA_UP_REPEAT, BUTTON_STOP|BUTTON_REPEAT, BUTTON_NONE},
163 { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
164 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
165 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
157#else 166#else
158 #error pluginlib_actions: Unsupported keypad 167 #error pluginlib_actions: Unsupported keypad
159#endif 168#endif
@@ -257,6 +266,13 @@ const struct button_mapping generic_left_right_fire[] =
257 { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, 266 { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
258 { PLA_FIRE, BUTTON_RC_MODE, BUTTON_NONE}, 267 { PLA_FIRE, BUTTON_RC_MODE, BUTTON_NONE},
259 { PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, 268 { PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE},
269#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
270 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
271 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
272 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
273 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
274 { PLA_FIRE, BUTTON_MENU, BUTTON_NONE},
275 { PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE},
260#else 276#else
261 #error pluginlib_actions: Unsupported keypad 277 #error pluginlib_actions: Unsupported keypad
262#endif 278#endif
@@ -391,6 +407,12 @@ const struct button_mapping generic_actions[] =
391 {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, 407 {PLA_MENU, BUTTON_MENU, BUTTON_NONE},
392 {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, 408 {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
393 {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, 409 {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
410#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
411 {PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
412 {PLA_START, BUTTON_PLAY, BUTTON_NONE},
413 {PLA_MENU, BUTTON_MENU, BUTTON_NONE},
414 {PLA_FIRE, BUTTON_VOLUP, BUTTON_NONE},
415 {PLA_FIRE_REPEAT, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE},
394#else 416#else
395 #error pluginlib_actions: Unsupported keypad 417 #error pluginlib_actions: Unsupported keypad
396#endif 418#endif
@@ -456,6 +478,11 @@ const struct button_mapping generic_increase_decrease[] =
456 {PLA_DEC, BUTTON_MINUS, BUTTON_NONE}, 478 {PLA_DEC, BUTTON_MINUS, BUTTON_NONE},
457 {PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE}, 479 {PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE},
458 {PLA_DEC_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE}, 480 {PLA_DEC_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE},
481#elif CONFIG_KEYPAD == IAUDIO67_PAD
482 {PLA_INC, BUTTON_VOLUP, BUTTON_NONE},
483 {PLA_DEC, BUTTON_VOLDOWN, BUTTON_NONE},
484 {PLA_INC_REPEAT, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE},
485 {PLA_DEC_REPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE},
459#else 486#else
460#error pluginlib_actions: Unsupported keypad 487#error pluginlib_actions: Unsupported keypad
461#endif 488#endif
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 418e29fc99..b26d03b48a 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -80,7 +80,7 @@ OUTPUT_FORMAT(elf32-sh)
80#define IRAMORIG DRAMORIG 80#define IRAMORIG DRAMORIG
81#define IRAMSIZE 0x4000 81#define IRAMSIZE 0x4000
82#define IRAM DRAM 82#define IRAM DRAM
83#elif defined(CPU_TCC780X) 83#elif defined(CPU_TCC780X) || defined(CPU_TCC77X)
84#define DRAMORIG 0x20000000 84#define DRAMORIG 0x20000000
85/*#define IRAMORIG 0x1000c000 85/*#define IRAMORIG 0x1000c000
86#define IRAMSIZE 0xc000*/ 86#define IRAMSIZE 0xc000*/