diff options
author | Robert Menes <rmenes@rockbox.org> | 2009-12-03 23:13:45 +0000 |
---|---|---|
committer | Robert Menes <rmenes@rockbox.org> | 2009-12-03 23:13:45 +0000 |
commit | 29d20d806838ca3a3691f723bdb0eaeefb480c5d (patch) | |
tree | e27b1b07b2c9fca77a5767c701dce06db7ee7106 | |
parent | f6a92b8e718a998b0a673ba39a01de90e1c73c82 (diff) | |
download | rockbox-29d20d806838ca3a3691f723bdb0eaeefb480c5d.tar.gz rockbox-29d20d806838ca3a3691f723bdb0eaeefb480c5d.zip |
Another round of plugin keymaps for the Philips GoGear SA9200.
Just a few more to go...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23838 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 10 | ||||
-rw-r--r-- | apps/plugins/fireworks.c | 4 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 12 | ||||
-rw-r--r-- | apps/plugins/goban/goban.h | 12 | ||||
-rw-r--r-- | apps/plugins/invadrox.c | 7 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 10 | ||||
-rw-r--r-- | apps/plugins/mandelbrot.c | 12 | ||||
-rw-r--r-- | apps/plugins/matrix.c | 5 | ||||
-rw-r--r-- | apps/plugins/mp3_encoder.c | 6 | ||||
-rw-r--r-- | apps/plugins/pegbox.c | 17 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 6 | ||||
-rw-r--r-- | apps/plugins/pong.c | 8 | ||||
-rw-r--r-- | apps/plugins/snow.c | 4 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 15 | ||||
-rw-r--r-- | apps/plugins/star.c | 17 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 8 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 4 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 10 | ||||
-rw-r--r-- | apps/plugins/superdom.c | 8 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 10 | ||||
-rw-r--r-- | utils/MTP/beastpatcher/Makefile | 2 |
21 files changed, 185 insertions, 2 deletions
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 5a58581f2b..b7ff3f5b0c 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -323,6 +323,16 @@ | |||
323 | #define CB_LEVEL BUTTON_PLAYLIST | 323 | #define CB_LEVEL BUTTON_PLAYLIST |
324 | #define CB_MENU BUTTON_MENU | 324 | #define CB_MENU BUTTON_MENU |
325 | 325 | ||
326 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
327 | #define CB_SELECT BUTTON_PLAY | ||
328 | #define CB_UP BUTTON_UP | ||
329 | #define CB_DOWN BUTTON_DOWN | ||
330 | #define CB_LEFT BUTTON_PREV | ||
331 | #define CB_RIGHT BUTTON_NEXT | ||
332 | #define CB_PLAY BUTTON_RIGHT | ||
333 | #define CB_LEVEL BUTTON_LEFT | ||
334 | #define CB_MENU BUTTON_MENU | ||
335 | |||
326 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 336 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
327 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 337 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
328 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 338 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index c7c7b58b93..782cff5ba8 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -99,6 +99,10 @@ PLUGIN_HEADER | |||
99 | #define BTN_MENU BUTTON_MENU | 99 | #define BTN_MENU BUTTON_MENU |
100 | #define BTN_FIRE BUTTON_SELECT | 100 | #define BTN_FIRE BUTTON_SELECT |
101 | 101 | ||
102 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
103 | #define BTN_MENU BUTTON_MENU | ||
104 | #define BTN_FIRE BUTTON_PLAY | ||
105 | |||
102 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 106 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
103 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) | 107 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) |
104 | 108 | ||
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 63260a4882..2165486080 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -276,6 +276,18 @@ PLUGIN_HEADER | |||
276 | #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST | 276 | #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST |
277 | #define FLIPIT_TOGGLE BUTTON_SELECT | 277 | #define FLIPIT_TOGGLE BUTTON_SELECT |
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
280 | |||
281 | #define FLIPIT_LEFT BUTTON_PREV | ||
282 | #define FLIPIT_RIGHT BUTTON_NEXT | ||
283 | #define FLIPIT_UP BUTTON_UP | ||
284 | #define FLIPIT_DOWN BUTTON_DOWN | ||
285 | #define FLIPIT_QUIT BUTTON_POWER | ||
286 | #define FLIPIT_SHUFFLE BUTTON_MENU | ||
287 | #define FLIPIT_SOLVE BUTTON_RIGHT | ||
288 | #define FLIPIT_STEP_BY_STEP BUTTON_LEFT | ||
289 | #define FLIPIT_TOGGLE BUTTON_PLAY | ||
290 | |||
279 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD | 291 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD |
280 | 292 | ||
281 | #define FLIPIT_QUIT BUTTON_POWER | 293 | #define FLIPIT_QUIT BUTTON_POWER |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 229c9aed59..e30e14bfe3 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -163,6 +163,18 @@ | |||
163 | #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT | 163 | #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT |
164 | #define GBN_BUTTON_NEXT_VAR BUTTON_VIEW | 164 | #define GBN_BUTTON_NEXT_VAR BUTTON_VIEW |
165 | 165 | ||
166 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | ||
167 | #define GBN_BUTTON_UP BUTTON_UP | ||
168 | #define GBN_BUTTON_DOWN BUTTON_DOWN | ||
169 | #define GBN_BUTTON_LEFT BUTTON_PREV | ||
170 | #define GBN_BUTTON_RIGHT BUTTON_NEXT | ||
171 | #define GBN_BUTTON_RETREAT BUTTON_VOL_DOWN | ||
172 | #define GBN_BUTTON_ADVANCE BUTTON_VOL_UP | ||
173 | #define GBN_BUTTON_MENU BUTTON_MENU | ||
174 | #define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL | ||
175 | #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT | ||
176 | #define GBN_BUTTON_NEXT_VAR BUTTON_RIGHT | ||
177 | |||
166 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 178 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
167 | #define GBN_BUTTON_UP BUTTON_UP | 179 | #define GBN_BUTTON_UP BUTTON_UP |
168 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 180 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index b3e5d164c6..a1182c2c75 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -172,6 +172,13 @@ PLUGIN_HEADER | |||
172 | #define RIGHT BUTTON_RIGHT | 172 | #define RIGHT BUTTON_RIGHT |
173 | #define FIRE BUTTON_SELECT | 173 | #define FIRE BUTTON_SELECT |
174 | 174 | ||
175 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
176 | |||
177 | #define QUIT BUTTON_POWER | ||
178 | #define LEFT BUTTON_PREV | ||
179 | #define RIGHT BUTTON_NEXT | ||
180 | #define FIRE BUTTON_PLAY | ||
181 | |||
175 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ | 182 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ |
176 | CONFIG_KEYPAD == ONDAVX777_PAD || \ | 183 | CONFIG_KEYPAD == ONDAVX777_PAD || \ |
177 | CONFIG_KEYPAD == MROBE500_PAD | 184 | CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index a55b1b2dae..51ad642c48 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -241,6 +241,16 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
241 | #define HK_SELECT "SELECT" | 241 | #define HK_SELECT "SELECT" |
242 | #define HK_CANCEL "POWER" | 242 | #define HK_CANCEL "POWER" |
243 | 243 | ||
244 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
245 | #define JEWELS_UP BUTTON_UP | ||
246 | #define JEWELS_DOWN BUTTON_DOWN | ||
247 | #define JEWELS_LEFT BUTTON_PREV | ||
248 | #define JEWELS_RIGHT BUTTON_NEXT | ||
249 | #define JEWELS_SELECT BUTTON_PLAY | ||
250 | #define JEWELS_CANCEL BUTTON_POWER | ||
251 | #define HK_SELECT "PLAY" | ||
252 | #define HK_CANCEL "POWER" | ||
253 | |||
244 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ | 254 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ |
245 | CONFIG_KEYPAD == ONDAVX777_PAD || \ | 255 | CONFIG_KEYPAD == ONDAVX777_PAD || \ |
246 | CONFIG_KEYPAD == MROBE500_PAD | 256 | CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index dbab55579d..c7d39763c5 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -283,6 +283,18 @@ PLUGIN_HEADER | |||
283 | #define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN | 283 | #define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN |
284 | #define MANDELBROT_RESET BUTTON_MENU | 284 | #define MANDELBROT_RESET BUTTON_MENU |
285 | 285 | ||
286 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
287 | #define MANDELBROT_QUIT BUTTON_POWER | ||
288 | #define MANDELBROT_UP BUTTON_UP | ||
289 | #define MANDELBROT_DOWN BUTTON_DOWN | ||
290 | #define MANDELBROT_LEFT BUTTON_PREV | ||
291 | #define MANDELBROT_RIGHT BUTTON_NEXT | ||
292 | #define MANDELBROT_ZOOM_IN BUTTON_RIGHT | ||
293 | #define MANDELBROT_ZOOM_OUT BUTTON_LEFT | ||
294 | #define MANDELBROT_MAXITER_INC BUTTON_VOL_UP | ||
295 | #define MANDELBROT_MAXITER_DEV BUTTON_VOL_DOWN | ||
296 | #define MANDELBROT_RESET BUTTON_MENU | ||
297 | |||
286 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD | 298 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD |
287 | #define MANDELBROT_QUIT BUTTON_POWER | 299 | #define MANDELBROT_QUIT BUTTON_POWER |
288 | 300 | ||
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index e6e0fa1175..a8d897d840 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -133,6 +133,11 @@ PLUGIN_HEADER | |||
133 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 133 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |
134 | #define MATRIX_PAUSE BUTTON_SELECT | 134 | #define MATRIX_PAUSE BUTTON_SELECT |
135 | 135 | ||
136 | #define MATRIX_EXIT BUTTON_POWER | ||
137 | #define MATRIX_SLEEP_MORE BUTTON_UP | ||
138 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | ||
139 | #define MATRIX_PAUSE BUTTON_PLAY | ||
140 | |||
136 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \ | 141 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \ |
137 | CONFIG_KEYPAD == ONDAVX777_PAD || \ | 142 | CONFIG_KEYPAD == ONDAVX777_PAD || \ |
138 | CONFIG_KEYPAD == MROBE500_PAD | 143 | CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index e001ab8cdf..f36a270dbf 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2488,6 +2488,12 @@ void get_mp3_filename(const char *wav_name) | |||
2488 | #define MP3ENC_DONE BUTTON_POWER | 2488 | #define MP3ENC_DONE BUTTON_POWER |
2489 | #define MP3ENC_SELECT BUTTON_SELECT | 2489 | #define MP3ENC_SELECT BUTTON_SELECT |
2490 | 2490 | ||
2491 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
2492 | #define MP3ENC_PREV BUTTON_UP | ||
2493 | #define MP3ENC_NEXT BUTTON_DOWN | ||
2494 | #define MP3ENC_DONE BUTTON_POWER | ||
2495 | #define MP3ENC_SELECT BUTTON_PLAY | ||
2496 | |||
2491 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ | 2497 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ |
2492 | CONFIG_KEYPAD == ONDAVX777_PAD || \ | 2498 | CONFIG_KEYPAD == ONDAVX777_PAD || \ |
2493 | CONFIG_KEYPAD == MROBE500_PAD | 2499 | CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 2766bb613c..c46a3de7bd 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -356,6 +356,23 @@ PLUGIN_HEADER | |||
356 | #define LVL_UP_TEXT "VOL+" | 356 | #define LVL_UP_TEXT "VOL+" |
357 | #define LVL_DOWN_TEXT "VOL-" | 357 | #define LVL_DOWN_TEXT "VOL-" |
358 | 358 | ||
359 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
360 | #define PEGBOX_SELECT BUTTON_RIGHT | ||
361 | #define PEGBOX_QUIT BUTTON_POWER | ||
362 | #define PEGBOX_RESTART BUTTON_MENU | ||
363 | #define PEGBOX_LVL_UP BUTTON_VOL_UP | ||
364 | #define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN | ||
365 | #define PEGBOX_UP BUTTON_UP | ||
366 | #define PEGBOX_DOWN BUTTON_DOWN | ||
367 | #define PEGBOX_RIGHT BUTTON_NEXT | ||
368 | #define PEGBOX_LEFT BUTTON_PREV | ||
369 | |||
370 | #define SELECT_TEXT "RIGHT" | ||
371 | #define QUIT_TEXT "POWER" | ||
372 | #define RESTART_TEXT "MENU" | ||
373 | #define LVL_UP_TEXT "VOL+" | ||
374 | #define LVL_DOWN_TEXT "VOL-" | ||
375 | |||
359 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ | 376 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ |
360 | CONFIG_KEYPAD == ONDAVX777_PAD || \ | 377 | CONFIG_KEYPAD == ONDAVX777_PAD || \ |
361 | CONFIG_KEYPAD == MROBE500_PAD | 378 | CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index aadeb18deb..f93e08eaba 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -130,6 +130,12 @@ static bool boosted = false; | |||
130 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 130 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
131 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 131 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
132 | 132 | ||
133 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
134 | #define PLASMA_QUIT BUTTON_POWER | ||
135 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | ||
136 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
137 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
138 | |||
133 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 139 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
134 | #define PLASMA_QUIT BUTTON_POWER | 140 | #define PLASMA_QUIT BUTTON_POWER |
135 | 141 | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 1c6f02eb0d..70af68cc5b 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -184,6 +184,14 @@ PLUGIN_HEADER | |||
184 | #define PONG_RIGHT_UP BUTTON_VOL_UP | 184 | #define PONG_RIGHT_UP BUTTON_VOL_UP |
185 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 185 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
186 | 186 | ||
187 | #elif CONFIG_KEYPAD = PHILIPS_SA9200_PAD | ||
188 | #define PONG_QUIT BUTTON_POWER | ||
189 | #define PONG_PAUSE BUTTON_MENU | ||
190 | #define PONG_LEFT_UP BUTTON_UP | ||
191 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
192 | #define PONG_RIGHT_UP BUTTON_VOL_UP | ||
193 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | ||
194 | |||
187 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ | 195 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ |
188 | CONFIG_KEYPAD == ONDAVX777_PAD || \ | 196 | CONFIG_KEYPAD == ONDAVX777_PAD || \ |
189 | CONFIG_KEYPAD == MROBE500_PAD | 197 | CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 99b6811df6..5fc1ed3804 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -71,6 +71,10 @@ PLUGIN_HEADER | |||
71 | (CONFIG_KEYPAD == CREATIVEZVM_PAD) | 71 | (CONFIG_KEYPAD == CREATIVEZVM_PAD) |
72 | #define SNOW_QUIT BUTTON_BACK | 72 | #define SNOW_QUIT BUTTON_BACK |
73 | 73 | ||
74 | #elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ | ||
75 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | ||
76 | #define SNOW_QUIT BUTTON_POWER | ||
77 | |||
74 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 78 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
75 | #define SNOW_QUIT BUTTON_REC | 79 | #define SNOW_QUIT BUTTON_REC |
76 | #define SNOW_RC_QUIT BUTTON_RC_REC | 80 | #define SNOW_RC_QUIT BUTTON_RC_REC |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 63a808877b..1e54ce962d 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -376,6 +376,21 @@ PLUGIN_HEADER | |||
376 | #define BUTTON_SAVE BUTTON_PLAYLIST | 376 | #define BUTTON_SAVE BUTTON_PLAYLIST |
377 | #define BUTTON_SAVE_NAME "PLAYLIST" | 377 | #define BUTTON_SAVE_NAME "PLAYLIST" |
378 | 378 | ||
379 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
380 | #define SOKOBAN_LEFT BUTTON_PREV | ||
381 | #define SOKOBAN_RIGHT BUTTON_NEXT | ||
382 | #define SOKOBAN_UP BUTTON_UP | ||
383 | #define SOKOBAN_DOWN BUTTON_DOWN | ||
384 | #define SOKOBAN_MENU BUTTON_MENU | ||
385 | #define SOKOBAN_UNDO BUTTON_LEFT | ||
386 | #define SOKOBAN_REDO (BUTTON_LEFT | BUTTON_PLAY) | ||
387 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN | ||
388 | #define SOKOBAN_LEVEL_REPEAT BUTTON_POWER | ||
389 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP | ||
390 | #define SOKOBAN_PAUSE BUTTON_PLAY | ||
391 | #define BUTTON_SAVE BUTTON_RIGHT | ||
392 | #define BUTTON_SAVE_NAME "RIGHT" | ||
393 | |||
379 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 394 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
380 | #define SOKOBAN_MENU BUTTON_MENU | 395 | #define SOKOBAN_MENU BUTTON_MENU |
381 | #define SOKOBAN_MENU_NAME "[MENU]" | 396 | #define SOKOBAN_MENU_NAME "[MENU]" |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 6079ba488e..72a2e7a907 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -327,6 +327,23 @@ PLUGIN_HEADER | |||
327 | #define STAR_LEVEL_DOWN_NAME "VOL DOWN" | 327 | #define STAR_LEVEL_DOWN_NAME "VOL DOWN" |
328 | #define STAR_LEVEL_REPEAT_NAME "VIEW" | 328 | #define STAR_LEVEL_REPEAT_NAME "VIEW" |
329 | 329 | ||
330 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
331 | |||
332 | #define STAR_QUIT BUTTON_POWER | ||
333 | #define STAR_LEFT BUTTON_PREV | ||
334 | #define STAR_RIGHT BUTTON_NEXT | ||
335 | #define STAR_UP BUTTON_UP | ||
336 | #define STAR_DOWN BUTTON_DOWN | ||
337 | #define STAR_TOGGLE_CONTROL BUTTON_PLAY | ||
338 | #define STAR_LEVEL_UP BUTTON_VOL_UP | ||
339 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN | ||
340 | #define STAR_LEVEL_REPEAT BUTTON_RIGHT | ||
341 | #define STAR_TOGGLE_CONTROL_NAME "PLAY" | ||
342 | #define STAR_QUIT_NAME "POWER" | ||
343 | #define STAR_LEVEL_UP_NAME "VOL UP" | ||
344 | #define STAR_LEVEL_DOWN_NAME "VOL DOWN" | ||
345 | #define STAR_LEVEL_REPEAT_NAME "RIGHT" | ||
346 | |||
330 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 347 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
331 | 348 | ||
332 | #define STAR_QUIT BUTTON_POWER | 349 | #define STAR_QUIT BUTTON_POWER |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 8c06ee0a5a..edc6441766 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -194,6 +194,14 @@ PLUGIN_HEADER | |||
194 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 194 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
195 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 195 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
196 | 196 | ||
197 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
198 | #define STOPWATCH_QUIT BUTTON_POWER | ||
199 | #define STOPWATCH_START_STOP BUTTON_PLAY | ||
200 | #define STOPWATCH_RESET_TIMER BUTTON_MENU | ||
201 | #define STOPWATCH_LAP_TIMER BUTTON_RIGHT | ||
202 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
203 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
204 | |||
197 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 205 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
198 | #define STOPWATCH_QUIT BUTTON_POWER | 206 | #define STOPWATCH_QUIT BUTTON_POWER |
199 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 207 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 412b197ae8..acd6065fbc 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -122,9 +122,11 @@ static const char default_game[9][9] = | |||
122 | #define MARK_SIZE 1 /* Mark width and height */ | 122 | #define MARK_SIZE 1 /* Mark width and height */ |
123 | 123 | ||
124 | #elif (LCD_HEIGHT==110) && (LCD_WIDTH==138) \ | 124 | #elif (LCD_HEIGHT==110) && (LCD_WIDTH==138) \ |
125 | || (LCD_HEIGHT==128) && (LCD_WIDTH==128) | 125 | || (LCD_HEIGHT==128) && (LCD_WIDTH==128) \ |
126 | || (LCD_HEIGHT==160) && (LCD_WIDTH==128) | ||
126 | /* iPod Mini - 138x110, 9 cells @ 10x10 with 14 border lines */ | 127 | /* iPod Mini - 138x110, 9 cells @ 10x10 with 14 border lines */ |
127 | /* iriver H10 5-6GB - 128x128, 9 cells @ 10x10 with 14 border lines */ | 128 | /* iriver H10 5-6GB - 128x128, 9 cells @ 10x10 with 14 border lines */ |
129 | /* Philips GoGear SA9200 - 128x160, 9 cells @ 10x10 with 14 border tiles */ | ||
128 | #define MARK_OFFS 1 /* Pixels between border and mark */ | 130 | #define MARK_OFFS 1 /* Pixels between border and mark */ |
129 | #define MARK_SPACE 1 /* Pixels between two marks */ | 131 | #define MARK_SPACE 1 /* Pixels between two marks */ |
130 | #define MARK_SIZE 2 /* Mark width and height */ | 132 | #define MARK_SIZE 2 /* Mark width and height */ |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 62bea7e9e9..1f9b1958e8 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -244,6 +244,16 @@ | |||
244 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 244 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
245 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW | 245 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW |
246 | 246 | ||
247 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
248 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
249 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
250 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
251 | #define SUDOKU_BUTTON_LEFT BUTTON_PREV | ||
252 | #define SUDOKU_BUTTON_RIGHT BUTTON_NEXT | ||
253 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY | ||
254 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
255 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_RIGHT | ||
256 | |||
247 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 257 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
248 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 258 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
249 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 259 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 6c8f9b7f3f..3fac0d0434 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -139,6 +139,14 @@ char buf[255]; | |||
139 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 139 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
140 | #define SUPERDOM_CANCEL BUTTON_BACK | 140 | #define SUPERDOM_CANCEL BUTTON_BACK |
141 | 141 | ||
142 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
143 | #define SUPERDOM_OK BUTTON_PLAY | ||
144 | #define SUPERDOM_UP BUTTON_UP | ||
145 | #define SUPERDOM_DOWN BUTTON_DOWN | ||
146 | #define SUPERDOM_LEFT BUTTON_PREV | ||
147 | #define SUPERDOM_RIGHT BUTTON_NEXT | ||
148 | #define SUPERDOM_CANCEL BUTTON_LEFT | ||
149 | |||
142 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) | 150 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) |
143 | #define SUPERDOM_CANCEL BUTTON_POWER | 151 | #define SUPERDOM_CANCEL BUTTON_POWER |
144 | 152 | ||
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 4d83dd0cc0..5b84c08694 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -324,6 +324,16 @@ PLUGIN_HEADER | |||
324 | #define VIEWER_MENU BUTTON_MENU | 324 | #define VIEWER_MENU BUTTON_MENU |
325 | #define VIEWER_AUTOSCROLL BUTTON_VIEW | 325 | #define VIEWER_AUTOSCROLL BUTTON_VIEW |
326 | 326 | ||
327 | /* Philips SA9200 keys */ | ||
328 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
329 | #define VIEWER_QUIT BUTTON_POWER | ||
330 | #define VIEWER_PAGE_UP BUTTON_UP | ||
331 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | ||
332 | #define VIEWER_SCREEN_LEFT BUTTON_PREV | ||
333 | #define VIEWER_SCREEN_RIGHT BUTTON_NEXT | ||
334 | #define VIEWER_MENU BUTTON_MENU | ||
335 | #define VIEWER_AUTOSCROLL BUTTON_PLAY | ||
336 | |||
327 | /* Onda VX747 keys */ | 337 | /* Onda VX747 keys */ |
328 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 338 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
329 | #define VIEWER_QUIT BUTTON_POWER | 339 | #define VIEWER_QUIT BUTTON_POWER |
diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile index d02f83481d..dea38c81f9 100644 --- a/utils/MTP/beastpatcher/Makefile +++ b/utils/MTP/beastpatcher/Makefile | |||
@@ -15,7 +15,7 @@ endif | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | ifneq ($(findstring MINGW,$(shell uname)),MINGW) | 17 | ifneq ($(findstring MINGW,$(shell uname)),MINGW) |
18 | LIBS = /usr/lib/libmtp.a /usr/lib/libusb.a | 18 | LIBS = /usr/local/lib/libmtp.a /usr/local/lib/libusb.a |
19 | CFLAGS += $(shell printf \ | 19 | CFLAGS += $(shell printf \ |
20 | '\#include <libmtp.h>\nlibmtp version: LIBMTP_VERSION\n' | \ | 20 | '\#include <libmtp.h>\nlibmtp version: LIBMTP_VERSION\n' | \ |
21 | gcc -E -P - -o - | grep -q '^libmtp version: 0\.2' && echo '-DOLDMTP') | 21 | gcc -E -P - -o - | grep -q '^libmtp version: 0\.2' && echo '-DOLDMTP') |