Index: apps/plugins/mp3_encoder.c =================================================================== --- apps/plugins/mp3_encoder.c (revision 22111) +++ apps/plugins/mp3_encoder.c (working copy) @@ -2488,6 +2488,12 @@ #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 == MROBE500_PAD #define MP3ENC_DONE BUTTON_POWER Index: apps/plugins/stats.c =================================================================== --- apps/plugins/stats.c (revision 22111) +++ apps/plugins/stats.c (working copy) @@ -93,6 +93,9 @@ #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD #define STATS_STOP BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define STATS_STOP BUTTON_POWER + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define STATS_STOP BUTTON_POWER Index: apps/plugins/superdom.c =================================================================== --- apps/plugins/superdom.c (revision 22111) +++ apps/plugins/superdom.c (working copy) @@ -139,6 +139,14 @@ #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_REW +#define SUPERDOM_RIGHT BUTTON_FFWD +#define SUPERDOM_CANCEL BUTTON_LEFT + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) #define SUPERDOM_CANCEL BUTTON_POWER Index: apps/plugins/sliding_puzzle.c =================================================================== --- apps/plugins/sliding_puzzle.c (revision 22111) +++ apps/plugins/sliding_puzzle.c (working copy) @@ -188,6 +188,15 @@ #define PUZZLE_SHUFFLE BUTTON_VIEW #define PUZZLE_PICTURE BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define PUZZLE_QUIT BUTTON_POWER +#define PUZZLE_LEFT BUTTON_REW +#define PUZZLE_RIGHT BUTTON_FFWD +#define PUZZLE_UP BUTTON_UP +#define PUZZLE_DOWN BUTTON_DOWN +#define PUZZLE_SHUFFLE BUTTON_RIGHT +#define PUZZLE_PICTURE BUTTON_MENU + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD #define PUZZLE_QUIT BUTTON_POWER #define PUZZLE_QUIT_TEXT "[POWER]" Index: apps/plugins/png/png.h =================================================================== --- apps/plugins/png/png.h (revision 22111) +++ apps/plugins/png/png.h (working copy) @@ -298,6 +298,17 @@ #define PNG_NEXT BUTTON_VIEW #define PNG_PREVIOUS BUTTON_PLAYLIST +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define PNG_ZOOM_IN BUTTON_VOL_UP +#define PNG_ZOOM_OUT BUTTON_VOL_DOWN +#define PNG_UP BUTTON_UP +#define PNG_DOWN BUTTON_DOWN +#define PNG_LEFT BUTTON_REW +#define PNG_RIGHT BUTTON_FFWD +#define PNG_MENU BUTTON_MENU +#define PNG_NEXT BUTTON_RIGHT +#define PNG_PREVIOUS BUTTON_LEFT + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define PNG_MENU BUTTON_POWER Index: apps/plugins/jpeg/jpeg.h =================================================================== --- apps/plugins/jpeg/jpeg.h (revision 22111) +++ apps/plugins/jpeg/jpeg.h (working copy) @@ -276,6 +276,17 @@ #define JPEG_NEXT BUTTON_VIEW #define JPEG_PREVIOUS BUTTON_PLAYLIST +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define JPEG_ZOOM_IN BUTTON_VOL_UP +#define JPEG_ZOOM_OUT BUTTON_VOL_DOWN +#define JPEG_UP BUTTON_UP +#define JPEG_DOWN BUTTON_DOWN +#define JPEG_LEFT BUTTON_REW +#define JEPG_RIGHT BUTTON_FFWD +#define JPEG_MENU BUTTON_MENU +#define JPEG_NEXT BUTTON_RIGHT +#define JPEG_PREVIOUS BUTTON_LEFT + #elif CONFIG_KEYPAD == ONDAVX747_PAD #else Index: apps/plugins/plasma.c =================================================================== --- apps/plugins/plasma.c (revision 22111) +++ apps/plugins/plasma.c (working copy) @@ -127,6 +127,12 @@ #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 Index: apps/plugins/dict.c =================================================================== --- apps/plugins/dict.c (revision 22111) +++ apps/plugins/dict.c (working copy) @@ -140,6 +140,8 @@ #define LP_QUIT BUTTON_BACK #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD #define LP_QUIT BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define LP_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == ONDAVX747_PAD #define LP_QUIT BUTTON_POWER #else Index: apps/plugins/flipit.c =================================================================== --- apps/plugins/flipit.c (revision 22111) +++ apps/plugins/flipit.c (working copy) @@ -276,6 +276,18 @@ #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST #define FLIPIT_TOGGLE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define FLIPIT_LEFT BUTTON_REW +#define FLIPIT_RIGHT BUTTON_FFWD +#define FLIPIT_UP BUTTON_UP +#define FLIPIT_DOWN BUTTON_DOWN +#define FLIPIT_QUIT BUTTON_POWER +#define FLIPIT_SHUFFLE BUTTON_MENU +#define FLIPIT_SOLVE BUTTON_LEFT +#define FLIPIT_STEP_BY_STEP BUTTON_RIGHT +#define FLIPIT_TOGGLE BUTTON_PLAY + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #define FLIPIT_QUIT BUTTON_POWER Index: apps/plugins/chessbox/chessbox_pgn.h =================================================================== --- apps/plugins/chessbox/chessbox_pgn.h (revision 22111) +++ apps/plugins/chessbox/chessbox_pgn.h (working copy) @@ -328,6 +328,16 @@ #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) +#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_REW +#define CB_RIGHT BUTTON_FFWD +#define CB_PLAY BUTTON_RIGHT +#define CB_LEVEL BUTTON_LEFT +#define CB_MENU BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define CB_LEVEL BUTTON_VOL_UP #define CB_RESTART BUTTON_VOL_DOWN Index: apps/plugins/oscilloscope.c =================================================================== --- apps/plugins/oscilloscope.c (revision 22111) +++ apps/plugins/oscilloscope.c (working copy) @@ -243,6 +243,17 @@ #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define OSCILLOSCOPE_QUIT BUTTON_POWER +#define OSCILLOSCOPE_DRAWMODE BUTTON_MENU +#define OSCILLOSCOPE_ADVMODE BUTTON_RIGHT +#define OSCILLOSCOPE_ORIENTATION BUTTON_UP +#define OSCILLOSCOPE_PAUSE BUTTON_PLAY +#define OSCILLOSCOPE_SPEED_UP BUTTON_FFWD +#define OSCILLOSCOPE_SPEED_DOWN BUTTON_REW +#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP +#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define OSCILLOSCOPE_QUIT BUTTON_POWER #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP Index: apps/plugins/starfield.c =================================================================== --- apps/plugins/starfield.c (revision 22111) +++ apps/plugins/starfield.c (working copy) @@ -131,6 +131,14 @@ #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define STARFIELD_QUIT BUTTON_POWER +#define STARFIELD_INCREASE_ZMOVE BUTTON_UP +#define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN +#define STARFIELD_INCREASE_NB_STARS BUTTON_FFWD +#define STARFIELD_DECREASE_NB_STARS BUTTON_REW +#define STARFIELD_TOGGLE_COLOR BUTTON_PLAY + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD #define STARFIELD_QUIT BUTTON_POWER Index: apps/plugins/snake2.c =================================================================== --- apps/plugins/snake2.c (revision 22111) +++ apps/plugins/snake2.c (working copy) @@ -76,8 +76,7 @@ #define MODIFIER_1 8 #define MODIFIER_2 6 #define CENTER_X 8 - #define CENTER_Y 34 - #define TOP_X1 34 + #define CENTER_Y 34 #define TOP_X1 34 #define TOP_X2 201 #define TOP_X3 42 #define TOP_X4 194 @@ -361,6 +360,20 @@ #define SNAKE2_PLAYPAUSE BUTTON_VIEW #define SNAKE2_PLAYPAUSE_TEXT "View" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define SNAKE2_LEFT BUTTON_REW +#define SNAKE2_RIGHT BUTTON_FFWD +#define SNAKE2_UP BUTTON_UP +#define SNAKE2_DOWN BUTTON_DOWN +#define SNAKE2_QUIT BUTTON_POWER +#define SNAKE2_LEVEL_UP BUTTON_UP +#define SNAKE2_LEVEL_DOWN BUTTON_DOWN +#define SNAKE2_MAZE_NEXT BUTTON_FFWD +#define SNAKE2_MAZE_LEFT BUTTON_REW +#define SNAKE2_SELECT_TYPE BUTTON_MENU +#define SNAKE2_PLAYPAUSE BUTTON_RIGHT +#define SNAKE2_PLAYPAUSE_TEXT "Right" + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD #define SNAKE2_QUIT BUTTON_POWER Index: apps/plugins/clix.c =================================================================== --- apps/plugins/clix.c (revision 22111) +++ apps/plugins/clix.c (working copy) @@ -138,6 +138,14 @@ #define CLIX_BUTTON_UP BUTTON_UP #define CLIX_BUTTON_DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define CLIX_BUTTON_QUIT BUTTON_POWER +#define CLIX_BUTTON_LEFT BUTTON_REW +#define CLIX_BUTTON_RIGHT BUTTON_FFWD +#define CLIX_BUTTON_CLICK BUTTON_PLAY +#define CLIX_BUTTON_UP BUTTON_UP +#define CLIX_BUTTON_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == COWOND2_PAD #define CLIX_BUTTON_QUIT BUTTON_POWER Index: apps/plugins/midi/midiplay.c =================================================================== --- apps/plugins/midi/midiplay.c (revision 22111) +++ apps/plugins/midi/midiplay.c (working copy) @@ -166,6 +166,14 @@ #define BTN_DOWN BUTTON_DOWN #define BTN_PLAY BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define BTN_QUIT BUTTON_POWER +#define BTN_RIGHT BUTTON_FFWD +#define BTN_LEFT BUTTON_REW +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN +#define BTN_PLAY BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define BTN_QUIT BUTTON_POWER Index: apps/plugins/snake.c =================================================================== --- apps/plugins/snake.c (revision 22111) +++ apps/plugins/snake.c (working copy) @@ -171,6 +171,14 @@ #define SNAKE_DOWN BUTTON_DOWN #define SNAKE_PLAYPAUSE BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define SNAKE_QUIT BUTTON_POWER +#define SNAKE_LEFT BUTTON_REW +#define SNAKE_RIGHT BUTTON_RIGHT +#define SNAKE_UP BUTTON_UP +#define SNAKE_DOWN BUTTON_DOWN +#define SNAKE_PLAYPAUSE BUTTON_MENU + #elif CONFIG_KEYPAD == MROBE500_PAD #define SNAKE_QUIT BUTTON_POWER #define SNAKE_RC_QUIT BUTTON_RC_DOWN Index: apps/plugins/bounce.c =================================================================== --- apps/plugins/bounce.c (revision 22111) +++ apps/plugins/bounce.c (working copy) @@ -170,6 +170,14 @@ #define BOUNCE_QUIT BUTTON_POWER #define BOUNCE_MODE BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define BOUNCE_LEFT BUTTON_REW +#define BOUNCE_RIGHT BUTTON_FFWD +#define BOUNCE_UP BUTTON_UP +#define BOUNCE_DOWN BUTTON_DOWN +#define BOUNCE_QUIT BUTTON_POWER +#define BOUNCE_MODE BUTTON_MENU + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define BOUNCE_QUIT BUTTON_POWER #define BOUNCE_MODE BUTTON_MENU Index: apps/plugins/cube.c =================================================================== --- apps/plugins/cube.c (revision 22111) +++ apps/plugins/cube.c (working copy) @@ -239,6 +239,16 @@ #define CUBE_PAUSE BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define CUBE_QUIT BUTTON_POWER +#define CUBE_NEXT BUTTON_FFWD +#define CUBE_PREV BUTTON_REW +#define CUBE_INC BUTTON_UP +#define CUBE_DEC BUTTON_DOWN +#define CUBE_MODE BUTTON_MENU +#define CUBE_PAUSE BUTTON_PLAY +#define CUBE_HIGHSPEED BUTTON_RIGHT + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define CUBE_QUIT BUTTON_POWER Index: apps/plugins/minesweeper.c =================================================================== --- apps/plugins/minesweeper.c (revision 22111) +++ apps/plugins/minesweeper.c (working copy) @@ -224,6 +224,16 @@ # define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_INFO BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +# define MINESWP_LEFT BUTTON_REW +# define MINESWP_RIGHT BUTTON_FFWD +# define MINESWP_UP BUTTON_UP +# define MINESWP_DOWN BUTTON_DOWN +# define MINESWP_QUIT BUTTON_POWER +# define MINESWP_TOGGLE BUTTON_LEFT +# define MINESWP_DISCOVER BUTTON_PLAY +# define MINESWP_INFO BUTTON_MENU + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD # define MINESWP_QUIT BUTTON_POWER Index: apps/plugins/lib/pluginlib_actions.c =================================================================== --- apps/plugins/lib/pluginlib_actions.c (revision 22111) +++ apps/plugins/lib/pluginlib_actions.c (working copy) @@ -59,6 +59,15 @@ { PLA_DOWN_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_RC_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RC_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, +#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) + { PLA_UP, BUTTON_RC_FF, BUTTON_NONE}, + { PLA_DOWN, BUTTON_RC_REW, BUTTON_NONE}, + { PLA_LEFT, BUTTON_RC_UP, BUTTON_NONE}, + { PLA_RIGHT, BUTTON_RC_DOWN, BUTTON_NONE}, + { PLA_UP_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_DOWN_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_LEFT_REPEAT, BUTTON_RC_UP|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_RIGHT_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_REMOTE_KEYPAD == MROBE_REMOTE) { PLA_UP, BUTTON_RC_PLAY, BUTTON_NONE}, { PLA_DOWN, BUTTON_RC_DOWN, BUTTON_NONE}, Index: apps/plugins/spacerocks.c =================================================================== --- apps/plugins/spacerocks.c (revision 22111) +++ apps/plugins/spacerocks.c (working copy) @@ -197,6 +197,20 @@ #define AST_RIGHT BUTTON_RIGHT #define AST_FIRE BUTTON_PLAYLIST +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define AST_PAUSE BUTTON_RIGHT +#define AST_QUIT BUTTON_POWER +#define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) +#define AST_THRUST BUTTON_UP +#define AST_HYPERSPACE BUTTON_DOWN +#define AST_LEFT BUTTON_REW +#define AST_LEFT_REP (BUTTON_REW | BUTTON_REPEAT) +#define AST_RIGHT BUTTON_FFWD +#define AST_RIGHT_REP (BUTTON_FFWD | BUTTON_REPEAT) +#define AST_FIRE BUTTON_MENU +#define AST_FIRE_REP (BUTTON_MENU | BUTTON_REPEAT) + + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD #define AST_QUIT BUTTON_POWER Index: apps/plugins/reversi/reversi-gui.c =================================================================== --- apps/plugins/reversi/reversi-gui.c (revision 22111) +++ apps/plugins/reversi/reversi-gui.c (working copy) @@ -32,9 +32,11 @@ At any time during the game, press MENU to bring up the game menu with further options: + - Save - Reload - Clear + */ #include "plugin.h" @@ -137,76 +139,7 @@ static bool quit_plugin; static bool game_finished; -#ifdef HAVE_TOUCHSCREEN -#include "lib/pluginlib_touchscreen.h" -/* This uses the touchscreen library functions/structures. */ -/* This defines the number of buttons used; only used in this C file. */ -#define TOUCHBUTTON_COUNT 3 - -/* Define the button locations, widths and heights */ - -#if LCD_HEIGHT < LCD_WIDTH -/* Define Menu button x, y, width, height */ -#define B_MENU_X LEGEND_X(0) -#define B_MENU_Y (LCD_HEIGHT/4) -#define B_MENU_W (LCD_WIDTH-LEGEND_X(0)) -#define B_MENU_H (LCD_HEIGHT/4) -/* Define Quit Button x, y, width, height */ -#define B_QUIT_X LEGEND_X(0) -#define B_QUIT_Y (LCD_HEIGHT/2) -#define B_QUIT_W (LCD_WIDTH-LEGEND_X(0)) -#define B_QUIT_H (LCD_HEIGHT/4) -#else -/* Define Menu button x, y, width, height */ -#define B_MENU_X (LCD_WIDTH/2) -#define B_MENU_Y LEGEND_Y(0) -#define B_MENU_W (LCD_WIDTH/4) -#define B_MENU_H (2*CELL_HEIGHT) -/* Define Quit Button x, y, width, height */ -#define B_QUIT_X (LCD_WIDTH-LCD_WIDTH/4) -#define B_QUIT_Y LEGEND_Y(0) -#define B_QUIT_W (LCD_WIDTH/4) -#define B_QUIT_H (2*CELL_HEIGHT) -#endif - -/* This is the button initialization/definition. The first element is the - * Viewport. This is defined in lcd.h, but the elements are: - * int x - X location of button/viewport - * int y - Y location of button/viewport - * int width - Width of button/viewport - * int height - Height of button/viewport - * int font - Font to be used on button/viewport - * int drawmode- Modes defined in lcd.h - * unsigned fg_pattern - foreground color - * unsigned bg_pattern - backbround color - * unsigned lss_pattern - Selector colors (currently unused) - * unsigned lse_pattern - | - * unsigned lst_pattern - \/ - * - * The rest of the touch button elements are: - * bool repeat - requires the area be held for the action - * int action - action this button will return - * bool invisible - Is this an invisible button? - * char *title - Specify a title - * fb_data *pixmap- Currently unused, but will allow for a graphic - */ -struct touchbutton reversi_buttons[TOUCHBUTTON_COUNT] = - { - { {B_MENU_X, B_MENU_Y, B_MENU_W, B_MENU_H, FONT_UI, - STYLE_DEFAULT, 0, 0xFFFF, 0, 0, 0}, - false, REVERSI_BUTTON_MENU, false, "Menu", NULL }, - - { {B_QUIT_X, B_QUIT_Y, B_QUIT_W, B_QUIT_H, FONT_UI, - STYLE_DEFAULT, 0, 0xFFFF, 0, 0, 0}, - false, REVERSI_BUTTON_QUIT, false, "Quit", NULL }, - - { {0, 0, XOFS+BOARD_WIDTH, YOFS+BOARD_HEIGHT, 0, - STYLE_DEFAULT, 0, 0xFFFF, 0, 0, 0}, - false, REVERSI_BUTTON_MAKE_MOVE, true, NULL, NULL } -}; -#endif - /* Initialises the state of the game (starts a new game) */ static void reversi_gui_init(void) { reversi_init_game(&game); @@ -251,12 +184,8 @@ int i; if (color == WHITE) { for (i = 0; i < CELL_LINE_THICKNESS; i++) { - rb->lcd_drawrect( - x+STONE_MARGIN+i, - y+STONE_MARGIN+i, - CELL_WIDTH+1-2*(STONE_MARGIN+i), - CELL_HEIGHT+1-2*(STONE_MARGIN+i) - ); + rb->lcd_drawrect(x+STONE_MARGIN+i, y+STONE_MARGIN+i, + CELL_WIDTH+1-2*(STONE_MARGIN+i), CELL_HEIGHT+1-2*(STONE_MARGIN+i)); } } else if (color == BLACK) { rb->lcd_fillrect(x+STONE_MARGIN, y+STONE_MARGIN, @@ -320,10 +249,6 @@ y = LEGEND_Y(r); rb->lcd_drawrect(x, y, CELL_WIDTH+1, CELL_HEIGHT+1); -#if defined(HAVE_TOUCHSCREEN) - touchbutton_draw(reversi_buttons, TOUCHBUTTON_COUNT); -#endif - /* Update the screen */ rb->lcd_update(); } @@ -374,10 +299,7 @@ break; } } - - result = - rb->set_option(prompt, &index, INT, strategy_settings, num_items, NULL); - + result = rb->set_option(prompt, &index, INT, strategy_settings, num_items, NULL); (*player) = strategy_values[index]; if((*player)->init_func) @@ -417,8 +339,7 @@ break; case 4: /* Cursor wrap mode */ - num_items = sizeof(cursor_wrap_mode_values) / - sizeof(cursor_wrap_mode_values[0]); + num_items = sizeof(cursor_wrap_mode_values)/sizeof(cursor_wrap_mode_values[0]); index = 0; for (i = 0; i < num_items; i++) { if (cursor_wrap_mode == cursor_wrap_mode_values[i]) { @@ -451,8 +372,7 @@ * Returns true iff the cursor would be really moved. In any case, the * new cursor position is stored in (new_row, new_col). */ -static bool -reversi_gui_cursor_pos_vmove(int row_delta, int *new_row, int *new_col) { +static bool reversi_gui_cursor_pos_vmove(int row_delta, int *new_row, int *new_col) { *new_row = cur_row + row_delta; *new_col = cur_col; @@ -501,8 +421,7 @@ * Returns true iff the cursor would be really moved. In any case, the * new cursor position is stored in (new_row, new_col). */ -static bool -reversi_gui_cursor_pos_hmove(int col_delta, int *new_row, int *new_col) { +static bool reversi_gui_cursor_pos_hmove(int col_delta, int *new_row, int *new_col) { *new_row = cur_row; *new_col = cur_col + col_delta; @@ -635,62 +554,39 @@ continue; } - /*********************************************************************** - * Button handling code happens below here - **********************************************************************/ button = rb->button_get(true); - - /* The touchscreen buttons can act as true buttons so OR them in */ -#ifdef HAVE_TOUCHSCREEN - button |= touchbutton_get(reversi_buttons, button, TOUCHBUTTON_COUNT); -#endif - /* All of these button presses wait for the release event */ - if(button&BUTTON_REL) { + switch (button) { #ifdef REVERSI_BUTTON_QUIT - if(button&REVERSI_BUTTON_QUIT) { + /* Exit game */ + case REVERSI_BUTTON_QUIT: exit = true; - } + break; #endif #ifdef HAVE_TOUCHSCREEN - if(button&BUTTON_TOUCHSCREEN) { - button_x = rb->button_get_data(); - button_y = button_x & 0xffff; - button_x >>= 16; - - /* Check if the click was in the gameboard, if so move cursor. - * This has to happen before MAKE_MOVE is processed. - */ - if( (CELL_R(button_y)button_get_data() >> 16; + button_y = rb->button_get_data() & 0xffff; + if( (CELL_R(button_y)>(BOARD_SIZE-1)) || + (CELL_C(button_x)>(BOARD_SIZE-1)) ) { + break; + } else { reversi_gui_move_cursor(CELL_R(button_y), CELL_C(button_x)); } - } #endif - if( (button&REVERSI_BUTTON_MENU) -#if defined(REVERSI_BUTTON_MENU_LONGPRESS) - && (lastbutton&BUTTON_REPEAT) +#ifdef REVERSI_BUTTON_ALT_MAKE_MOVE + case REVERSI_BUTTON_ALT_MAKE_MOVE: #endif - ) { - if (reversi_gui_menu()) { - return PLUGIN_USB_CONNECTED; - } - draw_screen = true; - } - - if(button&REVERSI_BUTTON_MAKE_MOVE -#if defined(REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS) - && !(lastbutton&BUTTON_REPEAT) -#endif - ) { - /* If you touch the game board instead of hitting menu after it - * has completed the game will exit out. - */ - if (game_finished) + case REVERSI_BUTTON_MAKE_MOVE: +#ifdef REVERSI_BUTTON_MAKE_MOVE_PRE + if ((button == REVERSI_BUTTON_MAKE_MOVE) + && (lastbutton != REVERSI_BUTTON_MAKE_MOVE_PRE)) break; +#endif + if (game_finished) break; if (reversi_make_move(&game, cur_row, cur_col, cur_player) > 0) { /* Move was made. Global changes on the board are possible */ draw_screen = true; /* Redraw the screen next time */ @@ -711,42 +607,66 @@ /* Ignore any button presses during the splash */ rb->button_clear_queue(); } - } - } - - /* These button presses will run on a release or a repeat event */ - if(button&BUTTON_REL || button&BUTTON_REPEAT) { + break; /* Move cursor left */ - if(button&REVERSI_BUTTON_LEFT) { +#ifdef REVERSI_BUTTON_ALT_LEFT + case REVERSI_BUTTON_ALT_LEFT: + case (REVERSI_BUTTON_ALT_LEFT | BUTTON_REPEAT): +#endif + case REVERSI_BUTTON_LEFT: + case (REVERSI_BUTTON_LEFT | BUTTON_REPEAT): if (reversi_gui_cursor_pos_hmove(-1, &row, &col)) { reversi_gui_move_cursor(row, col); } - } + break; + /* Move cursor right */ - if(button&REVERSI_BUTTON_RIGHT) { +#ifdef REVERSI_BUTTON_ALT_RIGHT + case REVERSI_BUTTON_ALT_RIGHT: + case (REVERSI_BUTTON_ALT_RIGHT | BUTTON_REPEAT): +#endif + case REVERSI_BUTTON_RIGHT: + case (REVERSI_BUTTON_RIGHT | BUTTON_REPEAT): if (reversi_gui_cursor_pos_hmove(1, &row, &col)) { reversi_gui_move_cursor(row, col); } - } + break; + /* Move cursor up */ - if(button&REVERSI_BUTTON_UP) { + case REVERSI_BUTTON_UP: + case (REVERSI_BUTTON_UP | BUTTON_REPEAT): if (reversi_gui_cursor_pos_vmove(-1, &row, &col)) { reversi_gui_move_cursor(row, col); } - } + break; + /* Move cursor down */ - if(button&REVERSI_BUTTON_DOWN) { + case REVERSI_BUTTON_DOWN: + case (REVERSI_BUTTON_DOWN | BUTTON_REPEAT): if (reversi_gui_cursor_pos_vmove(1, &row, &col)) { reversi_gui_move_cursor(row, col); } - } - } + break; - if (rb->default_event_handler(button) == SYS_USB_CONNECTED) { - /* Quit if USB has been connected */ - return PLUGIN_USB_CONNECTED; - } + case REVERSI_BUTTON_MENU: +#ifdef REVERSI_BUTTON_MENU_PRE + if (lastbutton != REVERSI_BUTTON_MENU_PRE) { + break; + } +#endif + if (reversi_gui_menu()) { + return PLUGIN_USB_CONNECTED; + } + draw_screen = true; + break; + default: + if (rb->default_event_handler(button) == SYS_USB_CONNECTED) { + /* Quit if USB has been connected */ + return PLUGIN_USB_CONNECTED; + } + break; + } if (button != BUTTON_NONE) { lastbutton = button; } Index: apps/plugins/reversi/reversi-gui.h =================================================================== --- apps/plugins/reversi/reversi-gui.h (revision 22111) +++ apps/plugins/reversi/reversi-gui.h (working copy) @@ -176,6 +176,15 @@ #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT #define REVERSI_BUTTON_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define REVERSI_BUTTON_QUIT BUTTON_POWER +#define REVERSI_BUTTON_UP BUTTON_UP +#define REVERSI_BUTTON_DOWN BUTTON_DOWN +#define REVERSI_BUTTON_LEFT BUTTON_REW +#define REVERSI_BUTTON_RIGHT BUTTON_FFWD +#define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAY +#define REVERSI_BUTTON_MENU BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define REVERSI_BUTTON_QUIT BUTTON_POWER #define REVERSI_BUTTON_MENU BUTTON_MENU Index: apps/plugins/logo.c =================================================================== --- apps/plugins/logo.c (revision 22111) +++ apps/plugins/logo.c (working copy) @@ -167,6 +167,13 @@ #define LP_DEC_Y BUTTON_DOWN #define LP_INC_Y BUTTON_UP +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define LP_QUIT BUTTON_POWER +#define LP_DEC_X BUTTON_REW +#define LP_INC_X BUTTON_FFWD +#define LP_DEC_Y BUTTON_DOWN +#define LP_INC_Y BUTON_UP + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define LP_QUIT BUTTON_POWER Index: apps/plugins/brickmania.c =================================================================== --- apps/plugins/brickmania.c (revision 22111) +++ apps/plugins/brickmania.c (working copy) @@ -174,6 +174,15 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN + +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define QUIT BUTTON_POWER +#define LEFT BUTTON_REW +#define RIGHT BUTTON_FFWD +#define SELECT BUTTON_PLAY +#define UP BUTTON_UP +#define DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == COWOND2_PAD #define QUIT BUTTON_POWER Index: apps/plugins/mazezam.c =================================================================== --- apps/plugins/mazezam.c (revision 22111) +++ apps/plugins/mazezam.c (working copy) @@ -57,6 +57,14 @@ # define MAZEZAM_UP BUTTON_UP # define MAZEZAM_DOWN BUTTON_DOWN +#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) +# define MAZEZAM_MENU BUTTON_POWER +# define MAZEZAM_SOLVE BUTTON_PLAY +# define MAZEZAM_RIGHT BUTTON_REW +# define MAZEZAM_LEFT BUTTON_FFWD +# define MAZEZAM_UP BUTTON_UP +# define MAZEZAM_DOWN BUTTON_DOWN + #else # include "lib/pluginlib_actions.h" # define MAZEZAM_MENU PLA_QUIT Index: apps/plugins/blackjack.c =================================================================== --- apps/plugins/blackjack.c (revision 22111) +++ apps/plugins/blackjack.c (working copy) @@ -333,6 +333,21 @@ #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define BJACK_START BUTTON_MENU +#define BJACK_QUIT BUTON_POWER +#define BJACK_MAX BUTTON_VOL_UP +#define BJACK_MIN BUTTON_VOL_DOWN +#define BJACK_HIT BUTTON_VOL_UP +#define BJACK_STAY BUTTON_VOL_DOWN +#define BJACK_DOUBLEDOWN BUTTON_PLAY +#define BJACK_SCORES BUTTON_RIGHT +#define BJACK_RESUME BUTTON_LEFT +#define BJACK_UP BUTTON_UP +#define BJACK_DOWN BUTTON_DOWN +#define BJACK_RIGHT BUTTON_FFWD +#define BJACK_LEFT BUTTON_LEFT + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define BJACK_QUIT BUTTON_POWER #define BJACK_DOUBLEDOWN BUTTON_VOL_DOWN @@ -1325,6 +1340,16 @@ rb->lcd_puts(0, 8, "MENU to view scores"); rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); rb->lcd_puts(0, 10, str); +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + rb->lcd_puts(0, 2, "MENU to start"); + rb->lcd_puts(0, 3, "VOLUP to hit"); + rb->lcd_puts(0, 4, "POWER to exit"); + rb->lcd_puts(0, 5, "VOLDOWN to stay"); + rb->lcd_puts(0, 6, "PLAY to double down"); + rb->lcd_puts(0, 7, "LEFT to save/resume"); + rb->lcd_puts(0, 8, "RIGHT to view scores"); + rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); + rb->lcd_puts(0, 10, str); #elif CONFIG_KEYPAD == COWOND2_PAD rb->lcd_puts(0, 6, "POWER to exit"); rb->lcd_puts(0, 7, "MINUS to double down"); Index: apps/plugins/stopwatch.c =================================================================== --- apps/plugins/stopwatch.c (revision 22111) +++ apps/plugins/stopwatch.c (working copy) @@ -194,6 +194,14 @@ #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_LEFT +#define STOPWATCH_SCROLL_UP BUTTON_UP +#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define STOPWATCH_QUIT BUTTON_POWER Index: apps/plugins/jewels.c =================================================================== --- apps/plugins/jewels.c (revision 22111) +++ apps/plugins/jewels.c (working copy) @@ -241,6 +241,14 @@ #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_REW +#define JEWELS_RIGHT BUTTON_FFWD +#define JEWELS_SELECT BUTTON_PLAY +#define JEWELS_CANCEL BUTTON_POWER + #elif CONFIG_KEYPAD == ONDAVX747_PAD || \ CONFIG_KEYPAD == MROBE500_PAD #define JEWELS_CANCEL BUTTON_POWER @@ -273,6 +281,17 @@ #endif #endif +/* use 10x8 tiles (iFP 700) */ +#if (LCD_HEIGHT == 64) && (LCD_WIDTH == 128) +#define NUM_SCORES 5 + +/* use 10x8 tiles (Recorder, Ondio) */ +#elif (LCD_HEIGHT == 64) && (LCD_WIDTH == 112) +#define NUM_SCORES 5 +#endif + +======= +>>>>>>> .r21975 #define TILE_WIDTH BMPWIDTH_jewels #define TILE_HEIGHT (BMPHEIGHT_jewels/23) Index: apps/plugins/calculator.c =================================================================== --- apps/plugins/calculator.c (revision 22111) +++ apps/plugins/calculator.c (working copy) @@ -330,6 +330,17 @@ #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define CALCULATOR_LEFT BUTTON_REW +#define CALCULATOR_RIGHT BUTTON_FFWD +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULTOR_QUIT BUTTON_POWER +#define CALCULATOR_INPUT BUTTON_PLAY +#define CALCULATOR_CALC BUTTON_MENU +#define CALCULATOR_CLEAR BUTTON_LEFT + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define CALCULATOR_QUIT BUTTON_POWER Index: apps/plugins/SUBDIRS =================================================================== --- apps/plugins/SUBDIRS (revision 22111) +++ apps/plugins/SUBDIRS (working copy) @@ -49,6 +49,7 @@ /* For all the swcodec targets */ #if CONFIG_CODEC == SWCODEC midi +mikmod /* beatbox */ #ifndef RB_PROFILE #if MEMORYSIZE > 2 /* mpegplayer allocates at least 2MB of RAM */ Index: apps/plugins/rockpaint.c =================================================================== --- apps/plugins/rockpaint.c (revision 22111) +++ apps/plugins/rockpaint.c (working copy) @@ -154,6 +154,17 @@ #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define ROCKPAINT_QUIT BUTTON_POWER +#define ROCKPAINT_DRAW BUTTON_PLAY +#define ROCKPAINT_MENU BUTTON_MENU +#define ROCKPAINT_TOOLBAR BUTTON_VOL_UP +#define ROCKPAINT_TOOLBAR2 BUTTON_RIGHT +#define ROCKPAINT_UP BUTTON_UP +#define ROCKPAINT_DOWN BUTTON_DOWN +#define ROCKPAINT_LEFT BUTTON_REW +#define ROCKPAINT_RIGHT BUTTON_FFWD + #elif ( CONFIG_KEYPAD == ONDAVX747_PAD ) #define ROCKPAINT_QUIT BUTTON_POWER #define ROCKPAINT_MENU BUTTON_MENU Index: apps/plugins/pacbox/pacbox.h =================================================================== --- apps/plugins/pacbox/pacbox.h (revision 22111) +++ apps/plugins/pacbox/pacbox.h (working copy) @@ -192,6 +192,17 @@ #define PACMAN_COIN BUTTON_VIEW #define PACMAN_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define PACMAN_UP BUTTON_UP +#define PACMAN_DOWN BUTTON_DOWN +#define PACMAN_LEFT BUTTON_REW +#define PACMAN_RIGHT BUTTON_FFWD +#define PACMAN_1UP BUTTON_VOL_UP +#define PACMAN_2UP BUTTON_VOL_DOWN +#define PACMAN_COIN BUTTON_RIGHT +#define PACMAN_MENU BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) Index: apps/plugins/xobox.c =================================================================== --- apps/plugins/xobox.c (revision 22111) +++ apps/plugins/xobox.c (working copy) @@ -199,6 +199,15 @@ #define DOWN BUTTON_DOWN #define PAUSE BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define QUIT BUTTON_POWER +#define LEFT BUTTON_REW +#define RIGHT BUTTON_FFWD +#define UP BUTTON_UP +#define DOWN BUTTON_DOWN +#define PAUSE BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #define QUIT BUTTON_POWER Index: apps/plugins/pong.c =================================================================== --- apps/plugins/pong.c (revision 22111) +++ apps/plugins/pong.c (working copy) @@ -184,6 +184,14 @@ #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 == MROBE500_PAD #define PONG_QUIT BUTTON_POWER Index: apps/plugins/pegbox.c =================================================================== --- apps/plugins/pegbox.c (revision 22111) +++ apps/plugins/pegbox.c (working copy) @@ -356,6 +356,23 @@ #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_FFWD +#define PEGBOX_LEFT BUTTON_REW + +#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 == MROBE500_PAD #define PEGBOX_QUIT BUTTON_POWER Index: apps/plugins/mandelbrot.c =================================================================== --- apps/plugins/mandelbrot.c (revision 22111) +++ apps/plugins/mandelbrot.c (working copy) @@ -283,6 +283,18 @@ #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_REW +#define MANDELBROT_RIGHT BUTTON_FFWD +#define MANDELBROT_ZOOM_IN BUTTON_RIGHT +#define MANDELBROT_ZOOM_OUT BUTTON_LEFT +#define MANDELBROT_MAXITER_INC BUTTON_VOL_UP +#define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN +#define MANDELBROT_RESET BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #define MANDELBROT_QUIT BUTTON_POWER Index: apps/plugins/sudoku/sudoku.h =================================================================== --- apps/plugins/sudoku/sudoku.h (revision 22111) +++ apps/plugins/sudoku/sudoku.h (working copy) @@ -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_REW +#define SUDOKU_BUTTON_RIGHT BUTTON_FFWD +#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 Index: apps/plugins/sudoku/sudoku.c =================================================================== --- apps/plugins/sudoku/sudoku.c (revision 22111) +++ apps/plugins/sudoku/sudoku.c (working copy) @@ -122,9 +122,16 @@ #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 lines */ + +/* Internal dimensions of a cell */ +#define CELL_WIDTH 10 +#define CELL_HEIGHT 10 + #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 */ Index: apps/plugins/zxbox/keymaps.h =================================================================== --- apps/plugins/zxbox/keymaps.h (revision 22111) +++ apps/plugins/zxbox/keymaps.h (working copy) @@ -157,6 +157,15 @@ #define ZX_SELECT BUTTON_SELECT #define ZX_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define ZX_UP BUTTON_UP +#define ZX_DOWN BUTTON_DOWN +#define ZX_LEFT BUTTON_REW +#define ZX_RIGHT BUTTON_FFWD +#define ZX_SELECT BUTTON_PLAY +#define ZX_MENU BUTTON_POWER + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define ZX_MENU (BUTTON_MENU|BUTTON_REL) Index: apps/plugins/rockblox1d.c =================================================================== --- apps/plugins/rockblox1d.c (revision 22111) +++ apps/plugins/rockblox1d.c (working copy) @@ -101,6 +101,10 @@ #define ONEDROCKBLOX_DOWN BUTTON_SELECT #define ONEDROCKBLOX_QUIT BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define ONEDROCKBLOX_DOWN BUTTON_PLAY +#define ONEDROCKBLOX_QUIT BUTTON_POWER + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define ONEDROCKBLOX_DOWN BUTTON_MENU #define ONEDROCKBLOX_QUIT BUTTON_POWER Index: apps/plugins/battery_bench.c =================================================================== --- apps/plugins/battery_bench.c (revision 22111) +++ apps/plugins/battery_bench.c (working copy) @@ -180,6 +180,13 @@ #define BATTERY_ON_TXT "MENU - start" #define BATTERY_OFF_TXT "POWER" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define BATTERY_ON BUTTON_MENU +#define BATTERY_OFF BUTTON_POWER +#define BATTERY_ON_TXT "MENU - start" +#define BATTERY_OFF_TXT "POWER" + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define BATTERY_OFF BUTTON_POWER Index: apps/plugins/fireworks.c =================================================================== --- apps/plugins/fireworks.c (revision 22111) +++ apps/plugins/fireworks.c (working copy) @@ -99,6 +99,10 @@ #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) Index: apps/plugins/rockblox.c =================================================================== --- apps/plugins/rockblox.c (revision 22111) +++ apps/plugins/rockblox.c (working copy) @@ -283,6 +283,18 @@ #define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_RESTART BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define ROCKBLOX_OFF BUTTON_POWER +#define ROCKBLOX_ROTATE_RIGHT BUTTON_RIGHT +#define ROCKBLOX_ROTATE_LEFT BUTTON_LEFT +#define ROCKBLOX_ROTATE BUTTON_UP +#define ROCKBLOX_DOWN BUTTON_DOWN +#define ROCKBLOX_LEFT BUTTON_REW +#define ROCKBLOX_RIGHT BUTTON_FFWD +#define ROCKBLOX_DROP BUTTON_PLAY +#define ROCKBLOX_RESTART BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_RESTART BUTTON_MENU @@ -427,6 +439,22 @@ #define HIGH_LEVEL_Y 126 #define HIGH_LABEL_X 114 +#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160) + +/* no room for the space in the highscore list */ +#define _SPACE "" + +#define BLOCK_WIDTH 6 +#define BLOCK_HEIGHT 6 +#define BOARD_X 4 +#define BOARD_Y 8 +#define PREVIEW_X 84 +#define PREVIEW_Y 134 +#define LABEL_X 67 +#define SCORE_Y 9 +#define LEVEL_Y 34 +#define LINES_Y 65 + #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) Index: apps/plugins/mpegplayer/mpegplayer.c =================================================================== --- apps/plugins/mpegplayer/mpegplayer.c (revision 22111) +++ apps/plugins/mpegplayer/mpegplayer.c (working copy) @@ -279,6 +279,15 @@ #define MPEG_RW BUTTON_LEFT #define MPEG_FF BUTTON_RIGHT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define MPEG_MENU BUTTON_MENU +#define MPEG_STOP BUTTON_POWER +#define MPEG_PAUSE BUTTON_PLAY +#define MPEG_VOLDOWN BUTTON_VOL_DOWN +#define MPEG_VOLUP BUTTON_VOL_UP +#define MPEG_RW BUTTON_UP +#define MPEG_FF BUTTON_DOWN + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define MPEG_MENU (BUTTON_MENU|BUTTON_REL) //#define MPEG_STOP BUTTON_POWER Index: apps/plugins/mpegplayer/mpeg_settings.c =================================================================== --- apps/plugins/mpegplayer/mpeg_settings.c (revision 22111) +++ apps/plugins/mpegplayer/mpeg_settings.c (working copy) @@ -170,6 +170,16 @@ #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP #define MPEG_START_TIME_EXIT BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define MPEG_START_TIME_SELECT BUTTON_PLAY +#define MPEG_START_TIME_LEFT BUTTON_REW +#define MPEG_START_TIME_RIGHT BUTTON_FFWD +#define MPEG_START_TIME_UP BUTTON_UP +#define MPEG_START_TIME_DOWN BUTTON_DOWN +#define MPEG_START_TIME_SCROLL_DOWN BUTTON_VOL_DOWN +#define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP +#define MPEG_START_TIME_EXIT BUTTON_POWER + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define MPEG_START_TIME_EXIT BUTTON_POWER Index: apps/plugins/solitaire.c =================================================================== --- apps/plugins/solitaire.c (revision 22111) +++ apps/plugins/solitaire.c (working copy) @@ -395,6 +395,24 @@ # define HK_CUR2STACK "SELECT.." # define HK_REM2STACK "VIEW+RIGHT" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +# define SOL_QUIT BUTTON_POWER +# define SOL_UP BUTTON_UP +# define SOL_DOWN BUTTON_DOWN +# define SOL_LEFT BUTTON_REW +# define SOL_RIGHT BUTTON_RIGHT +# define SOL_MOVE_PRE BUTTON_PLAY +# define SOL_MOVE (BUTTON_PLAY | BUTTON_REL) +# define SOL_DRAW BUTTON_MENU +# define SOL_REM2CUR BUTTON_LEFT +# define SOL_CUR2STACK (BUTTON_PLAY | BUTTON_REPEAT) +# define SOL_REM2STACK BUTTON_RIGHT +# define HK_MOVE "PLAY" +# define HK_DRAW "MENU" +# define HK_REM2CUR "LEFT" +# define HK_CUR2STACK "PLAY.." +# define REM2STACK "RIGHT" + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD # define SOL_QUIT BUTTON_POWER Index: apps/plugins/goban/goban.h =================================================================== --- apps/plugins/goban/goban.h (revision 22111) +++ apps/plugins/goban/goban.h (working copy) @@ -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_REW +#define GBN_BUTTON_RIGHT BUTTON_FFWD +#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 Index: apps/plugins/calendar.c =================================================================== --- apps/plugins/calendar.c (revision 22111) +++ apps/plugins/calendar.c (working copy) @@ -182,6 +182,16 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN #define CALENDAR_PREV_MONTH BUTTON_VOL_UP +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define CALENDAR_QUIT BUTTON_POWER +#define CALENDAR_SELECT BUTTON_PLAY +#define CALENDAR_NEXT_WEEK BUTTON_DOWN +#define CALENDAR_PREV_WEEK BUTTON_UP +#define CALENDAR_NEXT_DAY BUTTON_FFWD +#define CALENDAR_PREV_DAY BUTTON_REW +#define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN +#define CALENDAR_PREV_MONTH BUTTON_VOL_UP + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_MENU Index: apps/plugins/star.c =================================================================== --- apps/plugins/star.c (revision 22111) +++ apps/plugins/star.c (working copy) @@ -326,6 +326,18 @@ #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_REW +#define STAR_RIGHT BUTTON_FFWD +#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_MENU + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) #define STAR_QUIT BUTTON_POWER Index: apps/plugins/doom/i_video.c =================================================================== --- apps/plugins/doom/i_video.c (revision 22111) +++ apps/plugins/doom/i_video.c (working copy) @@ -321,6 +321,17 @@ #define DOOMBUTTON_ENTER BUTTON_VIEW #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define DOOMBUTTON_UP BUTTON_UP +#define DOOMBUTTON_DOWN BUTTON_DOWN +#define DOOMBUTTON_LEFT BUTTON_REW +#define DOOMBUTTON_RIGHT BUTTON_FFWD +#define DOOMBUTTON_SHOOT BUTTON_RIGHT +#define DOOMBUTTON_OPEN BUTTON_MENU +#define DOOMBUTTON_ESC BUTTON_POWER +#define DOOMBUTTON_ENTER BUTTON_LEFT +#define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN +#define DOOMBUTTON_MAP BUTTON_VOL_UP #elif CONFIG_KEYPAD == ONDAVX747_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_SHOOT BUTTON_VOL_UP Index: apps/plugins/vu_meter.c =================================================================== --- apps/plugins/vu_meter.c (revision 22111) +++ apps/plugins/vu_meter.c (working copy) @@ -272,6 +272,19 @@ #define LABEL_MENU "MENU" #define LABEL_VOLUME "UP/DOWN" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define VUMETER_QUIT BUTTON_POWER +#define VUMETER_HELP BUTTON_RIGHT +#define VUMETER_MENU BUTTON_MENU +#define VUMETER_MENU_EXIT BUTTON_MENU +#define VUMETER_MENU_EXIT2 BUTTON_POWER +#define VUMETER_UP BUTTON_UP +#define VUMETER_DOWN BUTTON_DOWN +#define LABEL_HELP "RIGHT" +#define LABEL_QUIT "POWER" +#define LABEL_MENU "MENU" +#define LABEL_VOLUME "UP/DOWN" + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define VUMETER_QUIT BUTTON_POWER #define VUMETER_MENU BUTTON_MENU Index: apps/plugins/rockboy/rockboy.c =================================================================== --- apps/plugins/rockboy/rockboy.c (revision 22111) +++ apps/plugins/rockboy/rockboy.c (working copy) @@ -241,6 +241,16 @@ options.SELECT=BUTTON_SELECT; options.MENU=BUTTON_MENU; +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + options.UP=BUTTON_UP; + options.DOWN=BUTTON_DOWN; + + options.A=BUTTON_VOL_UP; + options.B=BUTTON_VOL_DOWN; + options.START=BUTTON_RIGHT; + options.SELECT=BUTTON_LEFT; + options.MENU=BUTTON_MENU; + #elif CONFIG_KEYPAD == ONDAVX747_PAD options.A=BUTTON_VOL_UP; options.B=BUTTON_VOL_DOWN; Index: apps/plugins/lamp.c =================================================================== --- apps/plugins/lamp.c (revision 22111) +++ apps/plugins/lamp.c (working copy) @@ -82,6 +82,10 @@ # define LAMP_LEFT BUTTON_LEFT # define LAMP_RIGHT BUTTON_RIGHT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +# define LAMP_LEFT BUTTON_LEFT +# define LAMP_RIGHT BUTTON_RIGHT + #elif CONFIG_KEYPAD == ONDAVX747_PAD # define LAMP_LEFT BUTTON_VOL_DOWN # define LAMP_RIGHT BUTTON_VOL_UP Index: apps/plugins/sokoban.c =================================================================== --- apps/plugins/sokoban.c (revision 22111) +++ apps/plugins/sokoban.c (working copy) @@ -376,6 +376,21 @@ #define BUTTON_SAVE BUTTON_PLAYLIST #define BUTTON_SAVE_NAME "PLAYLIST" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define SOKOBAN_LEFT BUTTON_REW +#define SOKOBAN_RIGHT BUTTON_FFWD +#define SOKOBAN_UP BUTTON_UP +#define SOKOBAN_DOWN BUTTON_DOWN +#define SOKOBAN_MENU BUTTON_MENU +#define SOKOBAN_UNDO BUTTON_LEFT +#define SOKOBAN_REDO (BUTTON_PLAY | BUTTON_LEFT) +#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 SOKOBAN_SAVE BUTTON_RIGHT +#define SOKOBAN_SAVE_NAME "RIGHT" + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define SOKOBAN_MENU BUTTON_MENU #define SOKOBAN_MENU_NAME "[MENU]" Index: apps/plugins/chopper.c =================================================================== --- apps/plugins/chopper.c (revision 22111) +++ apps/plugins/chopper.c (working copy) @@ -134,6 +134,12 @@ #define ACTION2 BUTTON_SELECT #define ACTIONTEXT "MENU" +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define QUIT BUTTON_POWER +#define ACTION BUTTON_MENU +#define ACTION BUTTON_PLAY +#define ACTIONTEXT "PLAY" + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #define QUIT BUTTON_POWER Index: apps/plugins/viewer.c =================================================================== --- apps/plugins/viewer.c (revision 22111) +++ apps/plugins/viewer.c (working copy) @@ -323,6 +323,16 @@ #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_REW +#define VIEWER_SCREEN_RIGHT BUTTON_FFWD +#define VIEWER_MENU BUTTON_MENU +#define VIEWER_AUTOSCROLL BUTTON_RIGHT + /* Onda VX747 keys */ #elif CONFIG_KEYPAD == ONDAVX747_PAD #define VIEWER_QUIT BUTTON_POWER Index: apps/plugins/matrix.c =================================================================== --- apps/plugins/matrix.c (revision 22111) +++ apps/plugins/matrix.c (working copy) @@ -133,6 +133,12 @@ #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#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 == MROBE500_PAD #define MATRIX_EXIT BUTTON_POWER Index: apps/plugins/chip8.c =================================================================== --- apps/plugins/chip8.c (revision 22111) +++ apps/plugins/chip8.c (working copy) @@ -1102,6 +1102,19 @@ #define CHIP8_KEY8 BUTTON_DOWN #define CHIP8_KEY9 BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define CHIP8_OFF BUTTON_POWER +#define CHIP8_KEY1 BUTTON_LEFT +#define CHIP8_KEY2 BUTTON_UP +#define CHIP8_KEY3 BUTTON_RIGHT +#define CHIP8_KEY4 BUTTON_REW +#define CHIP8_KEY5 BUTTON_PLAY +#define CHIP8_KEY6 BUTTON_FFWD +#define CHIP8_KEY7 BUTTON_MENU +#define CHIP8_KEY8 BUTTON_DOWN +#define CHIP8_KEY9 BUTTON_VOL_UP +#define CHIP8_KEY0 BUTTON_VOL_DOWN + #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD #define CHIP8_OFF BUTTON_POWER Index: apps/plugins/bubbles.c =================================================================== --- apps/plugins/bubbles.c (revision 22111) +++ apps/plugins/bubbles.c (working copy) @@ -133,7 +133,7 @@ #define XOFS 64 #define MAX_FPS 30 -/* 16x16 bubbles (H300, iPod Color) */ +/* 16x16 bubbles (H300, iPod Color, HDD6330) */ #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220) #define XOFS 46 #define MAX_FPS 30 @@ -148,11 +148,18 @@ #define XOFS 40 #define MAX_FPS 40 -/* 12x12 bubbles (H100, H10, iAudio X5, iPod 3G, iPod 4G grayscale) */ +/* 12x12 bubbles (H100, H10, iAudio X5, HDD1630, iPod 3G, iPod 4G grayscale) */ #elif (LCD_HEIGHT == 128) && ((LCD_WIDTH == 160) || (LCD_WIDTH == 128)) #define XOFS 33 #define MAX_FPS 30 +/* 12x12 bubbles (SA9200) */ +#elif (LCD_HEIGHT == 160) && (LCD_WIDTH == 128) +#define XOFS 33 +#define ROW_HEIGHT 10 +#define ROW_INDENT 6 +#define MAX_FPS 30 + /* 10x10 bubbles (iPod Mini) */ #elif (LCD_HEIGHT == 110) && (LCD_WIDTH == 138) #define XOFS 33 Index: apps/plugins/chessclock.c =================================================================== --- apps/plugins/chessclock.c (revision 22111) +++ apps/plugins/chessclock.c (working copy) @@ -233,6 +233,16 @@ #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define CHC_QUIT BUTTON_POWER +#define CHC_STARTSTOP BUTTON_PLAY +#define CHC_RESET BUTTON_LEFT +#define CHC_MENU BUTTON_MENU +#define CHC_SETTINGS_INC BUTTON_FFWD +#define CHC_SETTINGS_DEC BUTTON_REW +#define CHC_SETTINGS_OK BUTTON_PLAY +#define CHC_SETTINGS_CANCEL BUTTON_POWER + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define CHC_QUIT BUTTON_POWER #define CHC_RESET (BUTTON_VOL_UP|BUTTON_VOL_DOWN) Index: apps/plugins/mosaique.c =================================================================== --- apps/plugins/mosaique.c (revision 22111) +++ apps/plugins/mosaique.c (working copy) @@ -147,6 +147,11 @@ #define MOSAIQUE_SPEED BUTTON_VIEW #define MOSAIQUE_RESTART BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define MOSAIQUE_QUIT BUTTON_POWER +#define MOSAIQUE_SPEED BUTTON_RIGHT +#define MOSAIQUE_RESTART BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define MOSAIQUE_QUIT BUTTON_POWER Index: apps/plugins/wormlet.c =================================================================== --- apps/plugins/wormlet.c (revision 22111) +++ apps/plugins/wormlet.c (working copy) @@ -283,6 +283,16 @@ #define BTN_QUIT BUTTON_POWER #define BTN_STOPRESET BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define BTN_DIR_UP BUTTON_UP +#define BTN_DIR_DOWN BUTTON_DOWN +#define BTN_DIR_LEFT BUTTON_REW +#define BTN_DIR_RIGHT BUTTON_FFWD +#define BTN_STARTPAUSE BUTTON_MENU +#define BTN_QUIT BUTTON_POWER +#define BTN_STOPRESET BUTTON_RIGHT + #define PLAYERS_TEXT "Up/Down" #define WORMS_TEXT "Left/Right" Index: apps/plugins/invadrox.c =================================================================== --- apps/plugins/invadrox.c (revision 22111) +++ apps/plugins/invadrox.c (working copy) @@ -140,6 +140,13 @@ #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT +#elif CONFIG_KEYPAD == GOGEAR_SA9200_PAD + +#define QUIT BUTTON_POWER +#define LEFT BUTTON_REW +#define RIGHT BUTTON_FFWD +#define FIRE BUTTON_UP + #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD #define QUIT BUTTON_POWER Index: tools/configure =================================================================== --- tools/configure (revision 22111) +++ tools/configure (working copy) @@ -1991,7 +1991,7 @@ bmp2rb_native="$rootdir/tools/bmp2rb -f 4" output="rockbox.mi4" appextra="recorder:gui" - plugins="" + plugins="yes" swcodec="yes" boottool="$rootdir/tools/scramble -mi4v3 -model=9200 -type=RBBL" bootoutput="FWImage.ebn"