From 7f7aee3f2457818547ec065ddd65bea0b3a68983 Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Thu, 22 May 2014 23:34:52 +0200 Subject: Separate keymaps for YH-820 and YH-920/925 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 --- apps/SOURCES | 3 ++- apps/plugins/battery_bench.c | 3 ++- apps/plugins/beatbox/beatbox.c | 3 ++- apps/plugins/blackjack.c | 3 ++- apps/plugins/brickmania.c | 3 ++- apps/plugins/bubbles.c | 3 ++- apps/plugins/calculator.c | 3 ++- apps/plugins/calendar.c | 3 ++- apps/plugins/chessbox/chessbox_pgn.h | 3 ++- apps/plugins/chessclock.c | 3 ++- apps/plugins/chip8.c | 3 ++- apps/plugins/chopper.c | 3 ++- apps/plugins/clix.c | 3 ++- apps/plugins/cube.c | 3 ++- apps/plugins/doom/i_video.c | 3 ++- apps/plugins/fft/fft.c | 3 ++- apps/plugins/flipit.c | 3 ++- apps/plugins/fractals/fractal.h | 3 ++- apps/plugins/goban/goban.h | 3 ++- apps/plugins/greyscale.c | 3 ++- apps/plugins/imageviewer/imageviewer_button.h | 3 ++- apps/plugins/invadrox.c | 3 ++- apps/plugins/jewels.c | 3 ++- apps/plugins/lib/pluginlib_actions.c | 6 ++++-- apps/plugins/metronome.c | 3 ++- apps/plugins/midi/midiplay.c | 3 ++- apps/plugins/minesweeper.c | 3 ++- apps/plugins/mp3_encoder.c | 3 ++- apps/plugins/mpegplayer/mpeg_settings.c | 3 ++- apps/plugins/mpegplayer/mpegplayer.c | 3 ++- apps/plugins/oscilloscope.c | 3 ++- apps/plugins/pacbox/pacbox.h | 3 ++- apps/plugins/pegbox.c | 3 ++- apps/plugins/pictureflow/pictureflow.c | 3 ++- apps/plugins/pong.c | 3 ++- apps/plugins/reversi/reversi-gui.h | 3 ++- apps/plugins/rockblox.c | 3 ++- apps/plugins/rockboy/rockboy.c | 3 ++- apps/plugins/rockpaint.c | 3 ++- apps/plugins/sliding_puzzle.c | 3 ++- apps/plugins/snake.c | 3 ++- apps/plugins/snake2.c | 3 ++- apps/plugins/sokoban.c | 3 ++- apps/plugins/solitaire.c | 3 ++- apps/plugins/spacerocks.c | 3 ++- apps/plugins/splitedit.c | 3 ++- apps/plugins/star.c | 3 ++- apps/plugins/stopwatch.c | 3 ++- apps/plugins/sudoku/sudoku.h | 3 ++- apps/plugins/superdom.c | 3 ++- apps/plugins/text_viewer/tv_button.h | 3 ++- apps/plugins/vu_meter.c | 3 ++- apps/plugins/wormlet.c | 3 ++- apps/plugins/xobox.c | 3 ++- apps/plugins/zxbox/keymaps.h | 3 ++- apps/plugins/zxbox/zxbox_keyb.c | 3 ++- 56 files changed, 114 insertions(+), 57 deletions(-) (limited to 'apps') diff --git a/apps/SOURCES b/apps/SOURCES index f0c9462faf..1aa4955205 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -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 diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 174a589d8f..7ab094df7e 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -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 diff --git a/apps/plugins/beatbox/beatbox.c b/apps/plugins/beatbox/beatbox.c index bbe02de6fe..4001e51e23 100644 --- a/apps/plugins/beatbox/beatbox.c +++ b/apps/plugins/beatbox/beatbox.c @@ -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 diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index adb92e1986..b54d40a717 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -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" diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 369af78910..1574fe7119 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -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 diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index e796afd672..539380859e 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c @@ -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 diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 77b00921e1..327ef69b45 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -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 diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 8e178c06c3..8e43823bb6 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -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 diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 56289025d7..3cc136e566 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h @@ -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 diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 7323a70705..a58dc6bbce 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -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 diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 6b42078817..63c9b7fa06 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -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 diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 92491d859b..db836e5393 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -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" diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index f7006b94ce..31951def28 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c @@ -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 diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 6aaa6fa37b..b75c1f21c8 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -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 diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 51e2d72723..57803fb57d 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -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 diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 466322e34c..e591954664 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c @@ -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 diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 15b887ae7f..056878e7e4 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -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 diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 4e538d234d..bb47282298 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h @@ -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 diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 1fc04c9389..d53c6bb5c4 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h @@ -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 diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index 42ebbef73b..31cd030f5b 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c @@ -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 diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 03bde20a12..4827ffa038 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h @@ -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 diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 43f614aa9a..ef53715753 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -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 diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index b7de8e4470..3270bd1a3d 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -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 diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index b1389ede3f..fb54dce1c8 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -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}, diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index 54af82fa76..c519608372 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c @@ -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 diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index d042eb6d1d..af76dcb13a 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c @@ -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 diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 07e2b557bd..c1e6b4a84d 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -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 diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 3b425463bf..642194b983 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -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 diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 57872bd70b..26dd24113c 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -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 diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 706d1546da..2e84a870a9 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -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 diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index bd3e5ae923..e23baf01d9 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -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) diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 267dd67e93..1270e9c064 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -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 diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index db6870fa4b..19f3d529e6 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -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) diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 933b134b8a..796b66a48d 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -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 diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 4df91b65f3..ccf07544f2 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -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 diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 9cd6622918..131a3df32a 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -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 diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index adfeb60670..77e834e52b 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -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 diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index d5f2a24b51..ba70d77627 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -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; diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 5de27d9947..ce1b911e43 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -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 diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 55ee46415f..53c64525ba 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -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 diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index d5168f79ba..e662a3b2e7 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -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 diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 779b8cf16c..54a2bc8709 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -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 diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index a962d34842..a3d760d5cd 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -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 diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index fbfe6776b5..0a1dc36cf5 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -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 diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 9d906516ae..bc67e4d6d6 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -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 diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index a17ce30f5a..955eb90bab 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c @@ -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 diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 5335e7665b..d74fc45e89 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -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 diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index f11266ce1b..e83fd5d42d 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -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 diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 5ffdc344f9..dc29594223 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -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 diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 04c606d05d..be480bcbb1 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c @@ -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 diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index ac88e9b5d4..b63f8780ea 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h @@ -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 diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index f424a7099f..06fc137754 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -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 diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index a53a849963..8f4c7ab5ac 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -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 diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 37bb32d2eb..7b2189762e 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -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 diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 28073ac8d4..659bcca40a 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -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 diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index e09fe9a7d8..62f593df37 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -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 -- cgit