From 29d20d806838ca3a3691f723bdb0eaeefb480c5d Mon Sep 17 00:00:00 2001 From: Robert Menes Date: Thu, 3 Dec 2009 23:13:45 +0000 Subject: [PATCH] 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 --- apps/plugins/chessbox/chessbox_pgn.h | 10 ++++++++++ apps/plugins/fireworks.c | 4 ++++ apps/plugins/flipit.c | 12 ++++++++++++ apps/plugins/goban/goban.h | 12 ++++++++++++ apps/plugins/invadrox.c | 7 +++++++ apps/plugins/jewels.c | 10 ++++++++++ apps/plugins/mandelbrot.c | 12 ++++++++++++ apps/plugins/matrix.c | 5 +++++ apps/plugins/mp3_encoder.c | 6 ++++++ apps/plugins/pegbox.c | 17 +++++++++++++++++ apps/plugins/plasma.c | 6 ++++++ apps/plugins/pong.c | 8 ++++++++ apps/plugins/snow.c | 4 ++++ apps/plugins/sokoban.c | 15 +++++++++++++++ apps/plugins/star.c | 17 +++++++++++++++++ apps/plugins/stopwatch.c | 8 ++++++++ apps/plugins/sudoku/sudoku.c | 4 +++- apps/plugins/sudoku/sudoku.h | 10 ++++++++++ apps/plugins/superdom.c | 8 ++++++++ apps/plugins/viewer.c | 10 ++++++++++ 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 @@ #define CB_LEVEL BUTTON_PLAYLIST #define CB_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define CB_SELECT BUTTON_PLAY +#define CB_UP BUTTON_UP +#define CB_DOWN BUTTON_DOWN +#define CB_LEFT BUTTON_PREV +#define CB_RIGHT BUTTON_NEXT +#define CB_PLAY BUTTON_RIGHT +#define CB_LEVEL BUTTON_LEFT +#define CB_MENU BUTTON_MENU + #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) #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 #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define BTN_MENU BUTTON_MENU +#define BTN_FIRE BUTTON_PLAY + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define BTN_MENU (BUTTON_MENU|BUTTON_REL) 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 #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST #define FLIPIT_TOGGLE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define FLIPIT_LEFT BUTTON_PREV +#define FLIPIT_RIGHT BUTTON_NEXT +#define FLIPIT_UP BUTTON_UP +#define FLIPIT_DOWN BUTTON_DOWN +#define FLIPIT_QUIT BUTTON_POWER +#define FLIPIT_SHUFFLE BUTTON_MENU +#define FLIPIT_SOLVE BUTTON_RIGHT +#define FLIPIT_STEP_BY_STEP BUTTON_LEFT +#define FLIPIT_TOGGLE BUTTON_PLAY + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #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 @@ #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT #define GBN_BUTTON_NEXT_VAR BUTTON_VIEW +#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) +#define GBN_BUTTON_UP BUTTON_UP +#define GBN_BUTTON_DOWN BUTTON_DOWN +#define GBN_BUTTON_LEFT BUTTON_PREV +#define GBN_BUTTON_RIGHT BUTTON_NEXT +#define GBN_BUTTON_RETREAT BUTTON_VOL_DOWN +#define GBN_BUTTON_ADVANCE BUTTON_VOL_UP +#define GBN_BUTTON_MENU BUTTON_MENU +#define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL +#define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT +#define GBN_BUTTON_NEXT_VAR BUTTON_RIGHT + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define GBN_BUTTON_UP BUTTON_UP #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 #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define QUIT BUTTON_POWER +#define LEFT BUTTON_PREV +#define RIGHT BUTTON_NEXT +#define FIRE BUTTON_PLAY + #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ CONFIG_KEYPAD == ONDAVX777_PAD || \ 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 #define HK_SELECT "SELECT" #define HK_CANCEL "POWER" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define JEWELS_UP BUTTON_UP +#define JEWELS_DOWN BUTTON_DOWN +#define JEWELS_LEFT BUTTON_PREV +#define JEWELS_RIGHT BUTTON_NEXT +#define JEWELS_SELECT BUTTON_PLAY +#define JEWELS_CANCEL BUTTON_POWER +#define HK_SELECT "PLAY" +#define HK_CANCEL "POWER" + #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ CONFIG_KEYPAD == ONDAVX777_PAD || \ 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 #define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN #define MANDELBROT_RESET BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define MANDELBROT_QUIT BUTTON_POWER +#define MANDELBROT_UP BUTTON_UP +#define MANDELBROT_DOWN BUTTON_DOWN +#define MANDELBROT_LEFT BUTTON_PREV +#define MANDELBROT_RIGHT BUTTON_NEXT +#define MANDELBROT_ZOOM_IN BUTTON_RIGHT +#define MANDELBROT_ZOOM_OUT BUTTON_LEFT +#define MANDELBROT_MAXITER_INC BUTTON_VOL_UP +#define MANDELBROT_MAXITER_DEV BUTTON_VOL_DOWN +#define MANDELBROT_RESET BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #define MANDELBROT_QUIT BUTTON_POWER 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 #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_SELECT +#define MATRIX_EXIT BUTTON_POWER +#define MATRIX_SLEEP_MORE BUTTON_UP +#define MATRIX_SLEEP_LESS BUTTON_DOWN +#define MATRIX_PAUSE BUTTON_PLAY + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \ CONFIG_KEYPAD == ONDAVX777_PAD || \ 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) #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define MP3ENC_PREV BUTTON_UP +#define MP3ENC_NEXT BUTTON_DOWN +#define MP3ENC_DONE BUTTON_POWER +#define MP3ENC_SELECT BUTTON_PLAY + #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ CONFIG_KEYPAD == ONDAVX777_PAD || \ 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 #define LVL_UP_TEXT "VOL+" #define LVL_DOWN_TEXT "VOL-" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define PEGBOX_SELECT BUTTON_RIGHT +#define PEGBOX_QUIT BUTTON_POWER +#define PEGBOX_RESTART BUTTON_MENU +#define PEGBOX_LVL_UP BUTTON_VOL_UP +#define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN +#define PEGBOX_UP BUTTON_UP +#define PEGBOX_DOWN BUTTON_DOWN +#define PEGBOX_RIGHT BUTTON_NEXT +#define PEGBOX_LEFT BUTTON_PREV + +#define SELECT_TEXT "RIGHT" +#define QUIT_TEXT "POWER" +#define RESTART_TEXT "MENU" +#define LVL_UP_TEXT "VOL+" +#define LVL_DOWN_TEXT "VOL-" + #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ CONFIG_KEYPAD == ONDAVX777_PAD || \ 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; #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN #define PLASMA_REGEN_COLORS BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define PLASMA_QUIT BUTTON_POWER +#define PLASMA_INCREASE_FREQUENCY BUTTON_UP +#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN +#define PLASMA_REGEN_COLORS BUTTON_PLAY + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define PLASMA_QUIT BUTTON_POWER 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 #define PONG_RIGHT_UP BUTTON_VOL_UP #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN +#elif CONFIG_KEYPAD = PHILIPS_SA9200_PAD +#define PONG_QUIT BUTTON_POWER +#define PONG_PAUSE BUTTON_MENU +#define PONG_LEFT_UP BUTTON_UP +#define PONG_LEFT_DOWN BUTTON_DOWN +#define PONG_RIGHT_UP BUTTON_VOL_UP +#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN + #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ CONFIG_KEYPAD == ONDAVX777_PAD || \ 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 (CONFIG_KEYPAD == CREATIVEZVM_PAD) #define SNOW_QUIT BUTTON_BACK +#elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ +(CONFIG_KEYPAD == PHILIPS_SA9200_PAD) +#define SNOW_QUIT BUTTON_POWER + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define SNOW_QUIT BUTTON_REC #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 #define BUTTON_SAVE BUTTON_PLAYLIST #define BUTTON_SAVE_NAME "PLAYLIST" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define SOKOBAN_LEFT BUTTON_PREV +#define SOKOBAN_RIGHT BUTTON_NEXT +#define SOKOBAN_UP BUTTON_UP +#define SOKOBAN_DOWN BUTTON_DOWN +#define SOKOBAN_MENU BUTTON_MENU +#define SOKOBAN_UNDO BUTTON_LEFT +#define SOKOBAN_REDO (BUTTON_LEFT | BUTTON_PLAY) +#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN +#define SOKOBAN_LEVEL_REPEAT BUTTON_POWER +#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP +#define SOKOBAN_PAUSE BUTTON_PLAY +#define BUTTON_SAVE BUTTON_RIGHT +#define BUTTON_SAVE_NAME "RIGHT" + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define SOKOBAN_MENU BUTTON_MENU #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 #define STAR_LEVEL_DOWN_NAME "VOL DOWN" #define STAR_LEVEL_REPEAT_NAME "VIEW" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define STAR_QUIT BUTTON_POWER +#define STAR_LEFT BUTTON_PREV +#define STAR_RIGHT BUTTON_NEXT +#define STAR_UP BUTTON_UP +#define STAR_DOWN BUTTON_DOWN +#define STAR_TOGGLE_CONTROL BUTTON_PLAY +#define STAR_LEVEL_UP BUTTON_VOL_UP +#define STAR_LEVEL_DOWN BUTTON_VOL_DOWN +#define STAR_LEVEL_REPEAT BUTTON_RIGHT +#define STAR_TOGGLE_CONTROL_NAME "PLAY" +#define STAR_QUIT_NAME "POWER" +#define STAR_LEVEL_UP_NAME "VOL UP" +#define STAR_LEVEL_DOWN_NAME "VOL DOWN" +#define STAR_LEVEL_REPEAT_NAME "RIGHT" + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #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 #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define STOPWATCH_QUIT BUTTON_POWER +#define STOPWATCH_START_STOP BUTTON_PLAY +#define STOPWATCH_RESET_TIMER BUTTON_MENU +#define STOPWATCH_LAP_TIMER BUTTON_RIGHT +#define STOPWATCH_SCROLL_UP BUTTON_UP +#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define STOPWATCH_QUIT BUTTON_POWER #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] = #define MARK_SIZE 1 /* Mark width and height */ #elif (LCD_HEIGHT==110) && (LCD_WIDTH==138) \ - || (LCD_HEIGHT==128) && (LCD_WIDTH==128) + || (LCD_HEIGHT==128) && (LCD_WIDTH==128) \ + || (LCD_HEIGHT==160) && (LCD_WIDTH==128) /* iPod Mini - 138x110, 9 cells @ 10x10 with 14 border lines */ /* iriver H10 5-6GB - 128x128, 9 cells @ 10x10 with 14 border lines */ +/* Philips GoGear SA9200 - 128x160, 9 cells @ 10x10 with 14 border tiles */ #define MARK_OFFS 1 /* Pixels between border and mark */ #define MARK_SPACE 1 /* Pixels between two marks */ #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 @@ #define SUDOKU_BUTTON_MENU BUTTON_MENU #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define SUDOKU_BUTTON_QUIT BUTTON_POWER +#define SUDOKU_BUTTON_UP BUTTON_UP +#define SUDOKU_BUTTON_DOWN BUTTON_DOWN +#define SUDOKU_BUTTON_LEFT BUTTON_PREV +#define SUDOKU_BUTTON_RIGHT BUTTON_NEXT +#define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY +#define SUDOKU_BUTTON_MENU BUTTON_MENU +#define SUDOKU_BUTTON_POSSIBLE BUTTON_RIGHT + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define SUDOKU_BUTTON_QUIT BUTTON_POWER #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]; #define SUPERDOM_RIGHT BUTTON_RIGHT #define SUPERDOM_CANCEL BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define SUPERDOM_OK BUTTON_PLAY +#define SUPERDOM_UP BUTTON_UP +#define SUPERDOM_DOWN BUTTON_DOWN +#define SUPERDOM_LEFT BUTTON_PREV +#define SUPERDOM_RIGHT BUTTON_NEXT +#define SUPERDOM_CANCEL BUTTON_LEFT + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) #define SUPERDOM_CANCEL BUTTON_POWER 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 #define VIEWER_MENU BUTTON_MENU #define VIEWER_AUTOSCROLL BUTTON_VIEW +/* Philips SA9200 keys */ +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define VIEWER_QUIT BUTTON_POWER +#define VIEWER_PAGE_UP BUTTON_UP +#define VIEWER_PAGE_DOWN BUTTON_DOWN +#define VIEWER_SCREEN_LEFT BUTTON_PREV +#define VIEWER_SCREEN_RIGHT BUTTON_NEXT +#define VIEWER_MENU BUTTON_MENU +#define VIEWER_AUTOSCROLL BUTTON_PLAY + /* Onda VX747 keys */ #elif CONFIG_KEYPAD == ONDAVX747_PAD #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 endif ifneq ($(findstring MINGW,$(shell uname)),MINGW) -LIBS = /usr/lib/libmtp.a /usr/lib/libusb.a +LIBS = /usr/local/lib/libmtp.a /usr/local/lib/libusb.a CFLAGS += $(shell printf \ '\#include \nlibmtp version: LIBMTP_VERSION\n' | \ gcc -E -P - -o - | grep -q '^libmtp version: 0\.2' && echo '-DOLDMTP')