summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Arigo <markarigo@gmail.com>2008-01-09 20:07:42 +0000
committerMark Arigo <markarigo@gmail.com>2008-01-09 20:07:42 +0000
commit2e69ec6aa76e37a7ba0c977460c6838648cd4eb1 (patch)
treed6f8b7b03677a8240874b4ef3d8a180dac32a32e
parent7152bce7de59f4dfb93389e8408398e0ad495c10 (diff)
downloadrockbox-2e69ec6aa76e37a7ba0c977460c6838648cd4eb1.tar.gz
rockbox-2e69ec6aa76e37a7ba0c977460c6838648cd4eb1.zip
m:robe 100 fixes: (1) add missing keymap (copied from H10), (2) rename lcd_yuv_blit to lcd_grey_phase_blit (since lcd is mono), and (3) update firmware/FILES for the new target. The bootloader and target builds should compile now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16037 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--apps/keymaps/keymap-mr100.c394
-rw-r--r--firmware/FILES1
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-mr100.c131
-rwxr-xr-xtools/configure4
4 files changed, 462 insertions, 68 deletions
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
new file mode 100644
index 0000000000..572f510fb9
--- /dev/null
+++ b/apps/keymaps/keymap-mr100.c
@@ -0,0 +1,394 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) Barry Wardell 2006
11 *
12 * All files in this archive are subject to the GNU General Public License.
13 * See the file COPYING in the source tree root for full license agreement.
14 *
15 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
16 * KIND, either express or implied.
17 *
18 ****************************************************************************/
19
20/* Button Code Definitions for Olympus m:robe 100 target
21 NOTE: COPIED FROM IRIVER H10, NEEDS ADAPTING TO MROBE 100 */
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_SCROLL_UP, BUTTON_NONE },
38 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
39 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE },
40 { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
41
42 { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
43 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
44 { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
45 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
46 { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
47
48 /* TODO: this is a bit of a hack so that we can exit some debug screens
49 * (audio, tagcache, dircache, hwinfo, stack, ports). They don't like it
50 * when ACTION_STD_CANCEL has anything other than BUTTON_NONE for prereq.
51 */
52 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE },
53
54 LAST_ITEM_IN_LIST
55}; /* button_context_standard */
56
57static const struct button_mapping remote_button_context_standard[] = {
58 { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE },
59 { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
60 { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
61 { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
62
63 LAST_ITEM_IN_LIST
64}; /* remote_button_context_standard */
65
66static const struct button_mapping button_context_wps[] = {
67 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
68 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY },
69 { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW},
70 { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
71 { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT },
72 { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL, BUTTON_FF },
73 { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
74 { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_REPEAT },
75
76 { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_FF, BUTTON_POWER },
77 { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_REW, BUTTON_POWER },
78 { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER },
79
80 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
81 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
82 { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE },
83 { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
84
85 { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
86 { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
87 { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
88 { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
89 { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY },
90 { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY },
91
92 LAST_ITEM_IN_LIST
93}; /* button_context_wps */
94
95static const struct button_mapping remote_button_context_wps[] = {
96 { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
97 { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY },
98 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW},
99 { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
100 { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT },
101 { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
102 { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
103 { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT },
104
105 { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
106 { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
107 { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE },
108 { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
109
110 { ACTION_WPS_PITCHSCREEN, BUTTON_RC_PLAY|BUTTON_LEFT, BUTTON_RC_PLAY },
111 { ACTION_WPS_ID3SCREEN, BUTTON_RC_PLAY|BUTTON_RIGHT, BUTTON_RC_PLAY },
112
113 LAST_ITEM_IN_LIST
114}; /* remote_button_context_wps */
115
116static const struct button_mapping button_context_settings[] = {
117 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE },
118 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
119 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
120 { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
121 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
122 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
123 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
124 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
125 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
126
127 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
128}; /* button_context_settings */
129
130static const struct button_mapping button_context_list[] = {
131 { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REL, BUTTON_REW },
132 { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REL, BUTTON_FF },
133
134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
135}; /* button_context_list */
136
137static const struct button_mapping remote_button_context_list[] = {
138 { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW },
139 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
140
141 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
142}; /* button_context_list */
143
144static const struct button_mapping button_context_tree[] = {
145 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
146 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
147
148 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
149}; /* button_context_tree */
150
151static const struct button_mapping remote_button_context_tree[] = {
152 { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
153 { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
154
155 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
156}; /* button_context_tree */
157
158static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
159 { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW },
160 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
161 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
162 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
163}; /* button_context_listtree_scroll_without_combo */
164
165static const struct button_mapping remote_button_context_listtree_scroll_without_combo[] = {
166 { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW },
167 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
168 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
169 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
170}; /* button_context_listtree_scroll_without_combo */
171
172static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
173 { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW },
174 { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF },
175 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_PLAY },
176 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_PLAY },
177 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_REW|BUTTON_REL },
178 { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_REW|BUTTON_PLAY },
179 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
180 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_PLAY, BUTTON_PLAY },
181 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_PLAY },
182 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_PLAY, BUTTON_FF|BUTTON_REL },
183 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
184 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
185}; /* button_context_listtree_scroll_with_combo */
186
187static const struct button_mapping remote_button_context_listtree_scroll_with_combo[] = {
188 { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW },
189 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF },
190 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_PLAY },
191 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_RC_PLAY },
192 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_REW|BUTTON_REL },
193 { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_REW|BUTTON_RC_PLAY },
194 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE },
195 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_RC_PLAY, BUTTON_RC_PLAY },
196 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_RC_PLAY },
197 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_RC_PLAY, BUTTON_RC_FF|BUTTON_REL },
198 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE },
199 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
200}; /* button_context_listtree_scroll_with_combo */
201
202static const struct button_mapping button_context_yesno[] = {
203 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE },
204 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
205}; /* button_context_settings_yesno */
206
207static const struct button_mapping button_context_quickscreen[] = {
208 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE },
209 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
210 { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
211 { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
212 { ACTION_QS_LEFT, BUTTON_REW, BUTTON_NONE },
213 { ACTION_QS_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
214 { ACTION_QS_RIGHT, BUTTON_FF, BUTTON_NONE },
215 { ACTION_QS_RIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
216
217 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
218}; /* button_context_quickscreen */
219
220static const struct button_mapping remote_button_context_quickscreen[] = {
221 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE },
222 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
223 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
224 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
225 { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE },
226 { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
227 { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE },
228 { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
229
230 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
231}; /* button_context_quickscreen */
232
233static const struct button_mapping button_context_settings_right_is_inc[] = {
234 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE },
235 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
236 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
237 { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
238 { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE },
239 { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
240 { ACTION_STD_NEXT, BUTTON_FF, BUTTON_NONE },
241 { ACTION_STD_NEXTREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
242 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
243 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
244 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
245 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
246
247 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
248}; /* button_context_settings_right_is_inc */
249
250static const struct button_mapping button_context_pitchscreen[] = {
251 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE },
252 { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
253 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE },
254 { ACTION_PS_DEC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
255 { ACTION_PS_NUDGE_LEFT, BUTTON_REW, BUTTON_NONE },
256 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_REW|BUTTON_REL, BUTTON_NONE },
257 { ACTION_PS_NUDGE_RIGHT, BUTTON_FF, BUTTON_NONE },
258 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_FF|BUTTON_REL, BUTTON_NONE },
259 { ACTION_PS_TOGGLE_MODE, BUTTON_POWER, BUTTON_NONE },
260 { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE },
261 { ACTION_PS_EXIT, BUTTON_LEFT, BUTTON_NONE },
262
263 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
264}; /* button_context_pitchscreen */
265
266static const struct button_mapping remote_button_context_pitchscreen[] = {
267 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE },
268 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
269 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
270 { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
271 { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE },
272 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE },
273 { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE },
274 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE },
275 { ACTION_PS_RESET, BUTTON_RC_PLAY, BUTTON_NONE },
276
277 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
278}; /* button_context_pitchscreen */
279
280static const struct button_mapping button_context_keyboard[] = {
281 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
282 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
283 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
284 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
285 { ACTION_KBD_SELECT, BUTTON_REW, BUTTON_NONE },
286 { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
287 { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE },
288 { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE },
289 { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
290 { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
291 { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
292 { ACTION_KBD_MORSE_INPUT, BUTTON_REW|BUTTON_PLAY, BUTTON_NONE },
293 { ACTION_KBD_MORSE_SELECT, BUTTON_REW|BUTTON_REL, BUTTON_NONE },
294
295 LAST_ITEM_IN_LIST
296}; /* button_context_keyboard */
297
298static const struct button_mapping button_context_bmark[] = {
299 { ACTION_BMS_DELETE, BUTTON_REW, BUTTON_NONE },
300 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
301}; /* button_context_bmark */
302
303const struct button_mapping button_context_recscreen[] = {
304 { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
305
306 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
307}; /* button_context_recscreen */
308
309static const struct button_mapping* get_context_mapping_remote( int context )
310{
311 context ^= CONTEXT_REMOTE;
312
313 switch (context)
314 {
315 case CONTEXT_STD:
316 case CONTEXT_MAINMENU:
317 return remote_button_context_standard;
318
319 case CONTEXT_WPS:
320 return remote_button_context_wps;
321
322 case CONTEXT_LIST:
323 return remote_button_context_list;
324 case CONTEXT_TREE:
325 if (global_settings.hold_lr_for_scroll_in_list)
326 return remote_button_context_listtree_scroll_without_combo;
327 else
328 return remote_button_context_listtree_scroll_with_combo;
329 case CONTEXT_CUSTOM|CONTEXT_TREE:
330 return remote_button_context_tree;
331
332 case CONTEXT_QUICKSCREEN:
333 return remote_button_context_quickscreen;
334 case CONTEXT_PITCHSCREEN:
335 return remote_button_context_pitchscreen;
336 case CONTEXT_RECSCREEN:
337 return button_context_recscreen;
338
339 default:
340 return remote_button_context_standard;
341 }
342}
343
344/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
345const struct button_mapping* get_context_mapping(int context)
346{
347 if (context&CONTEXT_REMOTE)
348 return get_context_mapping_remote(context);
349
350 switch (context)
351 {
352 case CONTEXT_STD:
353 return button_context_standard;
354
355 case CONTEXT_WPS:
356 return button_context_wps;
357
358 case CONTEXT_LIST:
359 return button_context_list;
360 case CONTEXT_TREE:
361 case CONTEXT_MAINMENU:
362 if (global_settings.hold_lr_for_scroll_in_list)
363 return button_context_listtree_scroll_without_combo;
364 else
365 return button_context_listtree_scroll_with_combo;
366 case CONTEXT_CUSTOM|CONTEXT_TREE:
367 return button_context_tree;
368
369 case CONTEXT_SETTINGS:
370 return button_context_settings;
371 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
372 case CONTEXT_SETTINGS_COLOURCHOOSER:
373 case CONTEXT_SETTINGS_EQ:
374 case CONTEXT_SETTINGS_TIME:
375 return button_context_settings_right_is_inc;
376
377 case CONTEXT_YESNOSCREEN:
378 return button_context_yesno;
379 case CONTEXT_BOOKMARKSCREEN:
380 return button_context_bmark;
381 case CONTEXT_QUICKSCREEN:
382 return button_context_quickscreen;
383 case CONTEXT_PITCHSCREEN:
384 return button_context_pitchscreen;
385 case CONTEXT_KEYBOARD:
386 return button_context_keyboard;
387 case CONTEXT_RECSCREEN:
388 return button_context_recscreen;
389
390 default:
391 return button_context_standard;
392 }
393 return button_context_standard;
394}
diff --git a/firmware/FILES b/firmware/FILES
index 1983a32685..d884e76d75 100644
--- a/firmware/FILES
+++ b/firmware/FILES
@@ -28,6 +28,7 @@ target/arm/ipod/3g/*.[chS]
28target/arm/ipod/video/*.[chS] 28target/arm/ipod/video/*.[chS]
29target/arm/iriver/*.[chS] 29target/arm/iriver/*.[chS]
30target/arm/iriver/h10/*.[chS] 30target/arm/iriver/h10/*.[chS]
31target/arm/olympus/mrobe-100/*.[chS]
31target/arm/pnx0101/*.[chS] 32target/arm/pnx0101/*.[chS]
32target/arm/pnx0101/iriver-ifp7xx/*.[chS] 33target/arm/pnx0101/iriver-ifp7xx/*.[chS]
33target/arm/s3c2440/*.[chS] 34target/arm/s3c2440/*.[chS]
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
index 501a0942e5..bf751f47a9 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
@@ -21,48 +21,48 @@
21#include "lcd.h" 21#include "lcd.h"
22#include "kernel.h" 22#include "kernel.h"
23#include "system.h" 23#include "system.h"
24 24
25/* send LCD data */ 25/* send LCD data */
26static void lcd_send_data(unsigned data) 26static void lcd_send_data(unsigned data)
27{ 27{
28 while (LCD1_CONTROL & LCD1_BUSY_MASK); /* wait for LCD */ 28 while (LCD1_CONTROL & LCD1_BUSY_MASK); /* wait for LCD */
29 LCD1_DATA = data; 29 LCD1_DATA = data;
30} 30}
31 31
32/* send LCD command */ 32/* send LCD command */
33static void lcd_send_command(unsigned cmd) 33static void lcd_send_command(unsigned cmd)
34{ 34{
35 while (LCD1_CONTROL & LCD1_BUSY_MASK); /* wait for LCD */ 35 while (LCD1_CONTROL & LCD1_BUSY_MASK); /* wait for LCD */
36 LCD1_CMD = cmd; 36 LCD1_CMD = cmd;
37} 37}
38 38
39/* LCD init */ 39/* LCD init */
40void lcd_init_device(void) 40void lcd_init_device(void)
41{ 41{
42 int i; 42 int i;
43 43
44 DEV_INIT1 &= ~0xfc000000; 44 DEV_INIT1 &= ~0xfc000000;
45 45
46 i = DEV_INIT1; 46 i = DEV_INIT1;
47 DEV_INIT1 = i; 47 DEV_INIT1 = i;
48 48
49 DEV_INIT2 &= ~0x400; 49 DEV_INIT2 &= ~0x400;
50 udelay(10000); 50 udelay(10000);
51 51
52 LCD1_CONTROL &= ~0x4; 52 LCD1_CONTROL &= ~0x4;
53 udelay(15); 53 udelay(15);
54 54
55 LCD1_CONTROL |= 0x4; 55 LCD1_CONTROL |= 0x4;
56 udelay(10); 56 udelay(10);
57 57
58 LCD1_CONTROL = 0x690; 58 LCD1_CONTROL = 0x690;
59 LCD1_CONTROL = 0x694; 59 LCD1_CONTROL = 0x694;
60 60
61 /* OF just reads these */ 61 /* OF just reads these */
62 i = LCD1_CONTROL; 62 i = LCD1_CONTROL;
63 i = inl(0x70003004); 63 i = inl(0x70003004);
64 i = LCD1_CMD; 64 i = LCD1_CMD;
65 i = inl(0x7000300c); 65 i = inl(0x7000300c);
66 66
67#if 0 67#if 0
68 /* this is skipped in the OF */ 68 /* this is skipped in the OF */
@@ -70,30 +70,30 @@ void lcd_init_device(void)
70 LCD1_CONTROL &= ~0x800; 70 LCD1_CONTROL &= ~0x800;
71 LCD1_CONTROL &= ~0x400; 71 LCD1_CONTROL &= ~0x400;
72#endif 72#endif
73 73
74 LCD1_CONTROL |= 0x1; 74 LCD1_CONTROL |= 0x1;
75 udelay(15000); 75 udelay(15000);
76 76
77 lcd_send_command(0xe2); 77 lcd_send_command(0xe2);
78 lcd_send_command(0x2f); 78 lcd_send_command(0x2f);
79 lcd_send_command(0x26); 79 lcd_send_command(0x26);
80 lcd_send_command(0xcc); 80 lcd_send_command(0xcc);
81 lcd_send_command(0xe8); 81 lcd_send_command(0xe8);
82 lcd_send_command(0x81); 82 lcd_send_command(0x81);
83 lcd_send_command(0); 83 lcd_send_command(0);
84 lcd_send_command(0x40); 84 lcd_send_command(0x40);
85 lcd_send_command(0xa6); 85 lcd_send_command(0xa6);
86 lcd_send_command(0x88); 86 lcd_send_command(0x88);
87 lcd_send_command(0xb0); 87 lcd_send_command(0xb0);
88 lcd_send_command(0x10); 88 lcd_send_command(0x10);
89 lcd_send_command(0); 89 lcd_send_command(0);
90} 90}
91 91
92/*** hardware configuration ***/ 92/*** hardware configuration ***/
93int lcd_default_contrast(void) 93int lcd_default_contrast(void)
94{ 94{
95 return DEFAULT_CONTRAST_SETTING; 95 return DEFAULT_CONTRAST_SETTING;
96} 96}
97 97
98void lcd_set_contrast(int val) 98void lcd_set_contrast(int val)
99{ 99{
@@ -117,8 +117,8 @@ void lcd_set_flip(bool yesno)
117/*** update functions ***/ 117/*** update functions ***/
118 118
119/* Performance function that works with an external buffer 119/* Performance function that works with an external buffer
120 note that by and bheight are in 4-pixel units! */ 120 note that by and bheight are in 8-pixel units! */
121void lcd_blit(const fb_data* data, int x, int by, int width, 121void lcd_blit(const unsigned char* data, int x, int by, int width,
122 int bheight, int stride) 122 int bheight, int stride)
123{ 123{
124 /* TODO: Implement lcd_blit() */ 124 /* TODO: Implement lcd_blit() */
@@ -130,19 +130,18 @@ void lcd_blit(const fb_data* data, int x, int by, int width,
130 (void)stride; 130 (void)stride;
131} 131}
132 132
133/* Performance function to blit a YUV bitmap directly to the LCD */ 133/* Performance function that works with an external buffer
134void lcd_yuv_blit(unsigned char * const src[3], 134 note that by and bheight are in 4-pixel units! */
135 int src_x, int src_y, int stride, 135void lcd_grey_phase_blit(const struct grey_data *data, int x, int by,
136 int x, int y, int width, int height) 136 int width, int bheight, int stride)
137{ 137{
138 (void)src; 138 /* TODO: Implement lcd_grey_phase_blit() */
139 (void)src_x; 139 (void)data;
140 (void)src_y;
141 (void)stride;
142 (void)x; 140 (void)x;
143 (void)y; 141 (void)by;
144 (void)width; 142 (void)width;
145 (void)height; 143 (void)bheight;
144 (void)stride;
146} 145}
147 146
148/* Update the display. 147/* Update the display.
@@ -151,9 +150,9 @@ void lcd_update(void)
151{ 150{
152 lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); 151 lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
153} 152}
154 153
155/* Update a fraction of the display. */ 154/* Update a fraction of the display. */
156void lcd_update_rect(int x0, int y0, int width, int height) 155void lcd_update_rect(int x0, int y0, int width, int height)
157{ 156{
158 unsigned char *addr; 157 unsigned char *addr;
159 unsigned int cmd0, cmd1, cmd2; 158 unsigned int cmd0, cmd1, cmd2;
@@ -189,4 +188,4 @@ void lcd_update_rect(int x0, int y0, int width, int height)
189 } 188 }
190 189
191 lcd_send_command(0xaf); 190 lcd_send_command(0xaf);
192} 191}
diff --git a/tools/configure b/tools/configure
index 5055a0f465..6dc23258dc 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1293,8 +1293,8 @@ EOF
1293 t_model="mrobe-500" 1293 t_model="mrobe-500"
1294 ;; 1294 ;;
1295 1295
1296 71|mrobe100) 1296 71|mrobe100)
1297 target_id=31 1297 target_id=33
1298 archos="mrobe100" 1298 archos="mrobe100"
1299 target="-DMROBE_100" 1299 target="-DMROBE_100"
1300 memory=32 # always 1300 memory=32 # always
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-12 21:17:54 +0000