Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Separate keymaps for YH-820 and YH-920/925

Browse source 
Although both players basically have the same keys, the
differences in the layout is rather big, so I think both
deserve their own keymaps.

(On the yh820 the FFWD/PLAY/REW buttons are located above the
direction keys, on the yh920 at the side of the player.
Furthermore the yh920/925 has a REC switch, whereas
yh820 has a push button.)

Change-Id: I0e62a1b101c387646c0bdb07ea142d9d2430ca15
Reviewed-on: http://gerrit.rockbox.org/814
Reviewed-by: Szymon Dziok <b0hoon@o2.pl>
This commit is contained in:
Sebastian Leonhardt 2014-05-22 23:34:52 +02:00 committed by Szymon Dziok
parent 4b181b4517
commit 7f7aee3f24
62 changed files with 123 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/SOURCES
View file

@ -266,7 +266,8 @@ keymaps/keymap-ondavx747.c
keymaps/keymap-ondavx777.c
#elif CONFIG_KEYPAD == ONDAVX767_PAD
keymaps/keymap-ondavx767.c
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
keymaps/keymap-yh8xx_yh9xx.c
#elif CONFIG_KEYPAD == MINI2440_PAD
keymaps/keymap-mini2440.c

3
apps/plugins/battery_bench.c
View file

@ -202,7 +202,8 @@
#define BATTERY_OFF BUTTON_POWER
#define BATTERY_OFF_TXT "POWER"
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define BATTERY_ON BUTTON_LEFT
#define BATTERY_OFF BUTTON_RIGHT

3
apps/plugins/beatbox/beatbox.c
View file

@ -99,7 +99,8 @@
#define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define BTN_QUIT BUTTON_PLAY
#define BTN_RIGHT BUTTON_RIGHT
#define BTN_UP BUTTON_UP

3
apps/plugins/blackjack.c
View file

@ -393,7 +393,8 @@ enum {
#define BJACK_QUIT_NAME "POWER"
#define BJACK_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define BJACK_SELECT_NAME "PLAY"
#define BJACK_STAY_NAME "RECORD"
#define BJACK_QUIT_NAME "REW"

3
apps/plugins/brickmania.c
View file

@ -243,7 +243,8 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
#elif CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define QUIT BUTTON_FFWD
#define SELECT BUTTON_PLAY
#define LEFT BUTTON_LEFT

3
apps/plugins/bubbles.c
View file

@ -82,7 +82,8 @@ enum {
#define BUBBLES_QUIT2 PLA_CANCEL
/* these are better off shooting with up */
#if (CONFIG_KEYPAD == SAMSUNG_YH_PAD) \
#if (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \
|| (CONFIG_KEYPAD == ONDIO_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define SHOOT_WITH_UP

3
apps/plugins/calculator.c
View file

@ -380,7 +380,8 @@ F3: equal to "="
#elif CONFIG_KEYPAD == MROBE500_PAD
#define CALCULATOR_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CALCULATOR_LEFT BUTTON_LEFT
#define CALCULATOR_RIGHT BUTTON_RIGHT

3
apps/plugins/calendar.c
View file

@ -258,7 +258,8 @@
#elif CONFIG_KEYPAD == MROBE500_PAD
#define CALENDAR_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CALENDAR_QUIT BUTTON_REC
#define CALENDAR_SELECT BUTTON_PLAY
#define CALENDAR_NEXT_WEEK BUTTON_DOWN

3
apps/plugins/chessbox/chessbox_pgn.h
View file

@ -366,7 +366,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define CB_MENU BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CB_SELECT (BUTTON_FFWD|BUTTON_RIGHT)
#define CB_UP BUTTON_UP
#define CB_DOWN BUTTON_DOWN

3
apps/plugins/chessclock.c
View file

@ -276,7 +276,8 @@
#define CHC_QUIT BUTTON_POWER
#define CHC_SETTINGS_CANCEL BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CHC_QUIT BUTTON_REC
#define CHC_STARTSTOP BUTTON_PLAY
#define CHC_RESET BUTTON_FFWD

3
apps/plugins/chip8.c
View file

@ -1143,7 +1143,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
CONFIG_KEYPAD == MROBE500_PAD
#define CHIP8_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CHIP8_OFF BUTTON_REC
#define CHIP8_KEY2 BUTTON_UP
#define CHIP8_KEY4 BUTTON_LEFT

3
apps/plugins/chopper.c
View file

@ -160,7 +160,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define QUIT BUTTON_LEFT
#define ACTION BUTTON_RIGHT
#define ACTIONTEXT "RIGHT"

3
apps/plugins/clix.c
View file

@ -181,7 +181,8 @@
#elif (CONFIG_KEYPAD == MROBE500_PAD)
#define CLIX_BUTTON_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CLIX_BUTTON_QUIT BUTTON_REC
#define CLIX_BUTTON_LEFT BUTTON_LEFT
#define CLIX_BUTTON_RIGHT BUTTON_RIGHT

3
apps/plugins/cube.c
View file

@ -279,7 +279,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define CUBE_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define CUBE_QUIT BUTTON_REC
#define CUBE_NEXT BUTTON_RIGHT
#define CUBE_PREV BUTTON_LEFT

3
apps/plugins/doom/i_video.c
View file

@ -395,7 +395,8 @@ void I_ShutdownGraphics(void)
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define DOOMBUTTON_ESC BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define DOOMBUTTON_UP BUTTON_UP
#define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT

3
apps/plugins/fft/fft.c
View file

@ -215,7 +215,8 @@ GREY_INFO_STRUCT
# define FFT_FREQ_SCALE BUTTON_DOWN
# define FFT_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
# define FFT_PREV_GRAPH BUTTON_LEFT
# define FFT_NEXT_GRAPH BUTTON_RIGHT
# define FFT_ORIENTATION BUTTON_UP

3
apps/plugins/flipit.c
View file

@ -322,7 +322,8 @@
#define FLIPIT_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define FLIPIT_LEFT BUTTON_LEFT
#define FLIPIT_RIGHT BUTTON_RIGHT

3
apps/plugins/fractals/fractal.h
View file

@ -318,7 +318,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define FRACTAL_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define FRACTAL_QUIT BUTTON_REC
#define FRACTAL_UP BUTTON_UP
#define FRACTAL_DOWN BUTTON_DOWN

3
apps/plugins/goban/goban.h
View file

@ -318,7 +318,8 @@
#define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL
#define GBN_BUTTON_NAV_MODE BUTTON_OFF
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define GBN_BUTTON_UP BUTTON_UP
#define GBN_BUTTON_DOWN BUTTON_DOWN
#define GBN_BUTTON_LEFT BUTTON_LEFT

3
apps/plugins/greyscale.c
View file

@ -99,7 +99,8 @@
#define GREYSCALE_RIGHT BUTTON_RIGHT
#define GREYSCALE_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define GREYSCALE_SHIFT BUTTON_FFWD
#define GREYSCALE_UP BUTTON_UP
#define GREYSCALE_DOWN BUTTON_DOWN

3
apps/plugins/imageviewer/imageviewer_button.h
View file

@ -314,7 +314,8 @@
#elif CONFIG_KEYPAD == ONDAVX747_PAD
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP)
#define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN)
#define IMGVIEW_UP BUTTON_UP

3
apps/plugins/invadrox.c
View file

@ -208,7 +208,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define QUIT BUTTON_REC
#define LEFT BUTTON_LEFT

3
apps/plugins/jewels.c
View file

@ -275,7 +275,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define JEWELS_CANCEL BUTTON_POWER
#define HK_CANCEL "POWER"
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define JEWELS_UP BUTTON_UP
#define JEWELS_DOWN BUTTON_DOWN
#define JEWELS_LEFT BUTTON_LEFT

6
apps/plugins/lib/pluginlib_actions.c
View file

@ -114,7 +114,8 @@ const struct button_mapping pla_main_ctx[] =
|| (CONFIG_KEYPAD == SANSA_M200_PAD)\
|| (CONFIG_KEYPAD == SANSA_E200_PAD) \
|| (CONFIG_KEYPAD == SANSA_FUZE_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \
|| (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \
|| (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \
@ -383,7 +384,8 @@ const struct button_mapping pla_main_ctx[] =
{PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE},
{PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP},
{PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
{PLA_CANCEL, BUTTON_REW, BUTTON_NONE},
{PLA_EXIT, BUTTON_FFWD, BUTTON_NONE},
{PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},

3
apps/plugins/metronome.c
View file

@ -610,7 +610,8 @@ static signed short sound[] = {
#endif
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \
|| (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
|| (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define MET_SYNC
#endif

3
apps/plugins/midi/midiplay.c
View file

@ -193,7 +193,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define BTN_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define BTN_QUIT BUTTON_REW
#define BTN_RIGHT BUTTON_RIGHT
#define BTN_LEFT BUTTON_LEFT

3
apps/plugins/minesweeper.c
View file

@ -247,7 +247,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
CONFIG_KEYPAD == MROBE500_PAD
# define MINESWP_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
# define MINESWP_LEFT BUTTON_LEFT
# define MINESWP_RIGHT BUTTON_RIGHT
# define MINESWP_UP BUTTON_UP

3
apps/plugins/mp3_encoder.c
View file

@ -2484,7 +2484,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
CONFIG_KEYPAD == MROBE500_PAD
#define MP3ENC_DONE BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define MP3ENC_PREV BUTTON_UP
#define MP3ENC_NEXT BUTTON_DOWN
#define MP3ENC_DONE BUTTON_PLAY

3
apps/plugins/mpegplayer/mpeg_settings.c
View file

@ -204,7 +204,8 @@ struct mpeg_settings settings;
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define MPEG_START_TIME_EXIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define MPEG_START_TIME_SELECT BUTTON_PLAY
#define MPEG_START_TIME_LEFT BUTTON_LEFT
#define MPEG_START_TIME_RIGHT BUTTON_RIGHT

3
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -317,7 +317,8 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define MPEG_MENU BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define MPEG_MENU BUTTON_LEFT
#define MPEG_STOP BUTTON_RIGHT
#define MPEG_PAUSE BUTTON_PLAY

3
apps/plugins/oscilloscope.c
View file

@ -349,7 +349,8 @@
#elif CONFIG_KEYPAD == MROBE500_PAD
#define OSCILLOSCOPE_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define OSCILLOSCOPE_QUIT BUTTON_REC
#define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT)
#define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT)

3
apps/plugins/pacbox/pacbox.h
View file

@ -232,7 +232,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define PACMAN_MENU BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define PACMAN_UP BUTTON_UP
#define PACMAN_DOWN BUTTON_DOWN

3
apps/plugins/pegbox.c
View file

@ -414,7 +414,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT_TEXT "POWER"
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD)
#define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY)
#define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW)

3
apps/plugins/pictureflow/pictureflow.c
View file

@ -61,7 +61,8 @@
#define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2)
#if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \
CONFIG_KEYPAD == SAMSUNG_YH_PAD || CONFIG_KEYPAD == MPIO_HD300_PAD
CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD || \
CONFIG_KEYPAD == MPIO_HD300_PAD
#define USE_CORE_PREVNEXT
#endif

3
apps/plugins/pong.c
View file

@ -215,7 +215,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
CONFIG_KEYPAD == MROBE500_PAD
#define PONG_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define PONG_QUIT BUTTON_REC
#define PONG_PAUSE BUTTON_PLAY
#define PONG_LEFT_UP BUTTON_UP

3
apps/plugins/reversi/reversi-gui.h
View file

@ -230,7 +230,8 @@
#define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
#define REVERSI_BUTTON_MENU BUTTON_MENU
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define REVERSI_BUTTON_QUIT BUTTON_REC
#define REVERSI_BUTTON_UP BUTTON_UP
#define REVERSI_BUTTON_DOWN BUTTON_DOWN

3
apps/plugins/rockblox.c
View file

@ -328,7 +328,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define ROCKBLOX_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY)
#define ROCKBLOX_ROTATE_CCW BUTTON_UP

3
apps/plugins/rockboy/rockboy.c
View file

@ -295,7 +295,8 @@ static void setoptions (void)
options.SELECT = BUTTON_RIGHT;
options.MENU = BUTTON_LEFT;
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
options.UP = BUTTON_UP;
options.DOWN = BUTTON_DOWN;

3
apps/plugins/rockpaint.c
View file

@ -199,7 +199,8 @@
#elif CONFIG_KEYPAD == MROBE500_PAD
#define ROCKPAINT_QUIT BUTTON_POWER
#elif ( CONFIG_KEYPAD == SAMSUNG_YH_PAD )
#elif ( CONFIG_KEYPAD == SAMSUNG_YH820_PAD ) || \
( CONFIG_KEYPAD == SAMSUNG_YH920_PAD )
#define ROCKPAINT_QUIT BUTTON_REC
#define ROCKPAINT_DRAW BUTTON_PLAY
#define ROCKPAINT_MENU BUTTON_FFWD

3
apps/plugins/sliding_puzzle.c
View file

@ -219,7 +219,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PUZZLE_QUIT BUTTON_POWER
#define PUZZLE_QUIT_TEXT "[POWER]"
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define PUZZLE_QUIT BUTTON_REC
#define PUZZLE_LEFT BUTTON_LEFT
#define PUZZLE_RIGHT BUTTON_RIGHT

3
apps/plugins/snake.c
View file

@ -190,7 +190,8 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
#define SNAKE_DOWN BUTTON_DOWN
#define SNAKE_PLAYPAUSE BUTTON_MENU
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define SNAKE_QUIT BUTTON_REC
#define SNAKE_LEFT BUTTON_LEFT
#define SNAKE_RIGHT BUTTON_RIGHT

3
apps/plugins/snake2.c
View file

@ -309,7 +309,8 @@ Head and Tail are stored
CONFIG_KEYPAD == MROBE500_PAD
#define SNAKE2_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define SNAKE2_LEFT BUTTON_LEFT
#define SNAKE2_RIGHT BUTTON_RIGHT
#define SNAKE2_UP BUTTON_UP

3
apps/plugins/sokoban.c
View file

@ -450,7 +450,8 @@
#define SOKOBAN_MENU BUTTON_POWER
#define SOKOBAN_MENU_NAME "[POWER]"
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define SOKOBAN_LEFT BUTTON_LEFT
#define SOKOBAN_RIGHT BUTTON_RIGHT
#define SOKOBAN_UP BUTTON_UP

3
apps/plugins/solitaire.c
View file

@ -452,7 +452,8 @@
CONFIG_KEYPAD == MROBE500_PAD
# define SOL_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
# define SOL_QUIT BUTTON_REC
# define SOL_UP BUTTON_UP
# define SOL_DOWN BUTTON_DOWN

3
apps/plugins/spacerocks.c
View file

@ -229,7 +229,8 @@
(CONFIG_KEYPAD == MROBE500_PAD)
#define AST_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define AST_PAUSE BUTTON_FFWD
#define AST_QUIT BUTTON_REC
#define AST_THRUST BUTTON_UP

3
apps/plugins/splitedit.c
View file

@ -55,7 +55,8 @@
#define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT)
#define SPLITEDIT_MENU_RUN BUTTON_RIGHT
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define SPLITEDIT_QUIT (BUTTON_REC | BUTTON_REW)
#define SPLITEDIT_PLAY (BUTTON_REC | BUTTON_FFWD)
#define SPLITEDIT_SAVE BUTTON_FFWD

3
apps/plugins/star.c
View file

@ -391,7 +391,8 @@
#define STAR_QUIT BUTTON_POWER
#define STAR_QUIT_NAME "POWER"
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define STAR_QUIT BUTTON_REC
#define STAR_LEFT BUTTON_LEFT

3
apps/plugins/stopwatch.c
View file

@ -223,7 +223,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define STOPWATCH_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define STOPWATCH_QUIT BUTTON_REC
#define STOPWATCH_START_STOP BUTTON_PLAY
#define STOPWATCH_RESET_TIMER BUTTON_LEFT

3
apps/plugins/sudoku/sudoku.h
View file

@ -282,7 +282,8 @@
#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
#define SUDOKU_BUTTON_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define SUDOKU_BUTTON_QUIT BUTTON_REC
#define SUDOKU_BUTTON_UP BUTTON_UP
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN

3
apps/plugins/superdom.c
View file

@ -167,7 +167,8 @@ char buf[255];
#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD)
#define SUPERDOM_CANCEL BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define SUPERDOM_OK BUTTON_PLAY
#define SUPERDOM_UP BUTTON_UP
#define SUPERDOM_DOWN BUTTON_DOWN

3
apps/plugins/text_viewer/tv_button.h
View file

@ -381,7 +381,8 @@
#define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER)
/* SAMSUNG YH-820 / YH-920 / YH-925 keys */
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define TV_QUIT BUTTON_REC
#define TV_SCROLL_UP BUTTON_UP
#define TV_SCROLL_DOWN BUTTON_DOWN

3
apps/plugins/vu_meter.c
View file

@ -283,7 +283,8 @@
#define VUMETER_QUIT BUTTON_POWER
#define LABEL_QUIT "POWER"
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define VUMETER_QUIT BUTTON_REC
#define VUMETER_HELP BUTTON_PLAY
#define VUMETER_MENU BUTTON_LEFT

3
apps/plugins/wormlet.c
View file

@ -271,7 +271,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define BTN_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define BTN_DIR_UP BUTTON_UP
#define BTN_DIR_DOWN BUTTON_DOWN

3
apps/plugins/xobox.c
View file

@ -232,7 +232,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#define QUIT BUTTON_PLAY
#define LEFT BUTTON_LEFT

3
apps/plugins/zxbox/keymaps.h
View file

@ -190,7 +190,8 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define ZX_MENU BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define ZX_UP BUTTON_UP
#define ZX_DOWN BUTTON_DOWN

3
apps/plugins/zxbox/zxbox_keyb.c
View file

@ -197,7 +197,8 @@
#define KBD_UP BUTTON_UP
#define KBD_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define KBD_SELECT BUTTON_PLAY
#define KBD_ABORT BUTTON_REW

3
bootloader/main-pp.c
View file

@ -81,7 +81,8 @@ extern void show_logo(void);
#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
#define BOOTLOADER_BOOT_OF BUTTON_VOL_UP
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define BOOTLOADER_BOOT_OF BUTTON_LEFT
#elif CONFIG_KEYPAD == SANSA_FUZE_PAD

3
firmware/export/config.h
View file

@ -130,7 +130,7 @@
#define SANSA_CLIP_PAD 35
#define SANSA_FUZE_PAD 36
#define LYRE_PROTO1_PAD 37
#define SAMSUNG_YH_PAD 38
#define SAMSUNG_YH820_PAD 38
#define ONDAVX777_PAD 39
#define SAMSUNG_YPS3_PAD 40
#define MINI2440_PAD 41
@ -154,6 +154,7 @@
#define SAMSUNG_YPZ5_PAD 59
#define IHIFI_PAD 60
#define SAMSUNG_YPR1_PAD 61
#define SAMSUNG_YH920_PAD 62
/* CONFIG_REMOTE_KEYPAD */
#define H100_REMOTE 1

2
firmware/export/config/samsungyh820.h
View file

@ -90,7 +90,7 @@
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE
#define CONFIG_KEYPAD SAMSUNG_YH_PAD
#define CONFIG_KEYPAD SAMSUNG_YH820_PAD
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/samsungyh920.h
View file

@ -90,7 +90,7 @@
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE
#define CONFIG_KEYPAD SAMSUNG_YH_PAD
#define CONFIG_KEYPAD SAMSUNG_YH920_PAD
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/samsungyh925.h
View file

@ -87,7 +87,7 @@
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE
#define CONFIG_KEYPAD SAMSUNG_YH_PAD
#define CONFIG_KEYPAD SAMSUNG_YH920_PAD
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

3
firmware/target/arm/pp/debug-pp.c
View file

@ -51,7 +51,8 @@
(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)
# define DEBUG_CANCEL BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
# define DEBUG_CANCEL BUTTON_PLAY
#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)