nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace SAMSUNG_YH920_PAD with YH92X 

seems more logical to me, and is more consistent, since
"SAMSUNG_YH92X_PAD" is already used in the tex files.

Change-Id: Ie9a9d850ea86155a7dcf86c88a22a420a10a3837
This commit is contained in:
Sebastian Leonhardt 2016-01-23 15:54:08 +01:00 committed by Gerrit Rockbox
parent 11c8b3927d
commit e6cd53ad53
65 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/SOURCES
View File

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

2
apps/plugins/battery_bench.c
View File

@ -204,7 +204,7 @@
#define BATTERY_OFF_TXT "POWER"
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define BATTERY_ON BUTTON_LEFT
#define BATTERY_OFF BUTTON_RIGHT

2
apps/plugins/beatbox/beatbox.c
View File

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

2
apps/plugins/blackjack.c
View File

@ -394,7 +394,7 @@ enum {
#define BJACK_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define BJACK_SELECT_NAME "PLAY"
#define BJACK_STAY_NAME "FFWD"
#define BJACK_QUIT_NAME "LONG REW"

2
apps/plugins/bounce.c
View File

@ -468,7 +468,7 @@ enum plugin_status plugin_start(const void* parameter)
{
int w, h;
char *off =
#if (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \
#if (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH820_PAD)
"[Rew] to stop";
#else

2
apps/plugins/brickmania.c
View File

@ -244,7 +244,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
#define QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define QUIT BUTTON_REW
#define SELECT BUTTON_PLAY
#define LEFT BUTTON_LEFT

2
apps/plugins/bubbles.c
View File

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

2
apps/plugins/calculator.c
View File

@ -392,7 +392,7 @@ F3: equal to "="
#define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL)
#define CALCULATOR_OPERATORS BUTTON_REC
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define CALCULATOR_LEFT BUTTON_LEFT
#define CALCULATOR_RIGHT BUTTON_RIGHT

2
apps/plugins/calendar.c
View File

@ -261,7 +261,7 @@
#elif CONFIG_KEYPAD == MROBE500_PAD
#define CALENDAR_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define CALENDAR_QUIT BUTTON_REW
#define CALENDAR_SELECT BUTTON_PLAY
#define CALENDAR_NEXT_WEEK BUTTON_DOWN

2
apps/plugins/chessbox/chessbox_pgn.h
View File

@ -371,7 +371,7 @@
#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define CB_SELECT BUTTON_PLAY
#define CB_UP BUTTON_UP
#define CB_DOWN BUTTON_DOWN

2
apps/plugins/chessclock.c
View File

@ -277,7 +277,7 @@
#define CHC_SETTINGS_CANCEL BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define CHC_QUIT BUTTON_REW
#define CHC_STARTSTOP BUTTON_PLAY
#define CHC_RESET BUTTON_FFWD

2
apps/plugins/chip8.c
View File

@ -1144,7 +1144,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define CHIP8_OFF BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define CHIP8_OFF BUTTON_REW
#define CHIP8_KEY0 BUTTON_FFWD
#define CHIP8_KEY2 BUTTON_UP

2
apps/plugins/chopper.c
View File

@ -161,7 +161,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define QUIT BUTTON_LEFT
#define ACTION BUTTON_RIGHT
#define ACTION2 BUTTON_UP

2
apps/plugins/clix.c
View File

@ -182,7 +182,7 @@
#define CLIX_BUTTON_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define CLIX_BUTTON_QUIT BUTTON_REW
#define CLIX_BUTTON_LEFT BUTTON_LEFT
#define CLIX_BUTTON_RIGHT BUTTON_RIGHT

2
apps/plugins/cube.c
View File

@ -280,7 +280,7 @@
#define CUBE_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define CUBE_QUIT BUTTON_REW
#define CUBE_NEXT BUTTON_RIGHT
#define CUBE_PREV BUTTON_LEFT

4
apps/plugins/doom/i_video.c
View File

@ -395,7 +395,7 @@ void I_ShutdownGraphics(void)
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define DOOMBUTTON_ESC BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define DOOMBUTTON_UP BUTTON_UP
#define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT
@ -617,7 +617,7 @@ static inline void getkey()
hswitch=0;
}
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
/* Bring up the menu */
event.data1=KEY_ESCAPE;
#else

2
apps/plugins/fft/fft.c
View File

@ -216,7 +216,7 @@ GREY_INFO_STRUCT
# define FFT_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
# define FFT_PREV_GRAPH BUTTON_LEFT
# define FFT_NEXT_GRAPH BUTTON_RIGHT
# define FFT_ORIENTATION BUTTON_UP

4
apps/plugins/flipit.c
View File

@ -345,7 +345,7 @@
#define FLIPIT_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define FLIPIT_LEFT BUTTON_LEFT
#define FLIPIT_RIGHT BUTTON_RIGHT
@ -941,7 +941,7 @@ enum plugin_status plugin_start(const void* parameter)
rb->lcd_putsxy(2, 28, "[VOL+] shuffle");
rb->lcd_putsxy(2, 38, "[PREV] solution");
rb->lcd_putsxy(2, 48, "[NEXT] step by step");
#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \
#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH820_PAD)
rb->lcd_putsxy(2, 8, "Long [REW] to stop");
rb->lcd_putsxy(2, 18, "[PLAY] toggle");

2
apps/plugins/fractals/fractal.h
View File

@ -332,7 +332,7 @@
#define FRACTAL_PRECISION_DEC (BUTTON_REC | BUTTON_DOWN)
#define FRACTAL_RESET BUTTON_PLAY
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define FRACTAL_QUIT (BUTTON_REW | BUTTON_REPEAT)
#define FRACTAL_UP BUTTON_UP
#define FRACTAL_DOWN BUTTON_DOWN

2
apps/plugins/goban/goban.h
View File

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

2
apps/plugins/greyscale.c
View File

@ -100,7 +100,7 @@
#define GREYSCALE_OFF BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define GREYSCALE_SHIFT BUTTON_FFWD
#define GREYSCALE_UP BUTTON_UP
#define GREYSCALE_DOWN BUTTON_DOWN

2
apps/plugins/imageviewer/imageviewer_button.h
View File

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

2
apps/plugins/invadrox.c
View File

@ -209,7 +209,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define QUIT BUTTON_REW
#define LEFT BUTTON_LEFT

2
apps/plugins/jewels.c
View File

@ -298,7 +298,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define HK_CANCEL "POWER"
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define JEWELS_UP BUTTON_UP
#define JEWELS_DOWN BUTTON_DOWN
#define JEWELS_LEFT BUTTON_LEFT

4
apps/plugins/lib/pluginlib_actions.c
View File

@ -115,7 +115,7 @@ const struct button_mapping pla_main_ctx[] =
|| (CONFIG_KEYPAD == SANSA_E200_PAD) \
|| (CONFIG_KEYPAD == SANSA_FUZE_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) \
|| (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \
|| (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \
@ -386,7 +386,7 @@ const struct button_mapping pla_main_ctx[] =
{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_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
|| (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
{PLA_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_REW},
{PLA_EXIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE},
{PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},

2
apps/plugins/midi/midiplay.c
View File

@ -194,7 +194,7 @@
#define BTN_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define BTN_QUIT (BUTTON_PLAY|BUTTON_REPEAT)
#define BTN_RIGHT BUTTON_RIGHT
#define BTN_LEFT BUTTON_LEFT

2
apps/plugins/minesweeper.c
View File

@ -257,7 +257,7 @@ CONFIG_KEYPAD == MROBE500_PAD
# define MINESWP_DISCOVER BUTTON_FFWD
# define MINESWP_INFO BUTTON_REC
#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
# define MINESWP_LEFT BUTTON_LEFT
# define MINESWP_RIGHT BUTTON_RIGHT
# define MINESWP_UP BUTTON_UP

2
apps/plugins/mp3_encoder.c
View File

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

2
apps/plugins/mpegplayer/mpeg_settings.c
View File

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

2
apps/plugins/mpegplayer/mpegplayer.c
View File

@ -318,7 +318,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define MPEG_MENU BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define MPEG_MENU BUTTON_REW
#define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT)
#define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL)

2
apps/plugins/oscilloscope.c
View File

@ -349,7 +349,7 @@
#elif CONFIG_KEYPAD == MROBE500_PAD
#define OSCILLOSCOPE_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define OSCILLOSCOPE_QUIT BUTTON_REW
#define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD
#define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT)

2
apps/plugins/pacbox/pacbox.h
View File

@ -232,7 +232,7 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define PACMAN_MENU BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define PACMAN_UP BUTTON_RIGHT
#define PACMAN_DOWN BUTTON_LEFT

2
apps/plugins/pegbox.c
View File

@ -414,7 +414,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT_TEXT "POWER"
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define PEGBOX_QUIT BUTTON_REW
#define PEGBOX_RESTART BUTTON_FFWD
#define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_UP)

2
apps/plugins/pictureflow/pictureflow.c
View File

@ -155,7 +155,7 @@ const struct button_mapping pf_context_buttons[] =
{PF_QUIT, BUTTON_OFF, BUTTON_NONE},
#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
{PF_QUIT, BUTTON_REC, BUTTON_NONE},
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
{PF_QUIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW},
{PF_MENU, BUTTON_REW|BUTTON_REL, BUTTON_REW},
{PF_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},

2
apps/plugins/pong.c
View File

@ -215,7 +215,7 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
CONFIG_KEYPAD == MROBE500_PAD
#define PONG_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define PONG_QUIT (BUTTON_PLAY|BUTTON_REPEAT)
#define PONG_PAUSE (BUTTON_PLAY|BUTTON_REL)
#define PONG_LEFT_UP BUTTON_UP

2
apps/plugins/reversi/reversi-gui.h
View File

@ -231,7 +231,7 @@
#define REVERSI_BUTTON_MENU BUTTON_MENU
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define REVERSI_BUTTON_QUIT BUTTON_REW
#define REVERSI_BUTTON_UP BUTTON_UP
#define REVERSI_BUTTON_DOWN BUTTON_DOWN

2
apps/plugins/rockblox.c
View File

@ -328,7 +328,7 @@
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define ROCKBLOX_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define ROCKBLOX_OFF BUTTON_FFWD
#define ROCKBLOX_ROTATE_CCW BUTTON_UP

2
apps/plugins/rockboy/rockboy.c
View File

@ -285,7 +285,7 @@ static void setoptions (void)
#elif CONFIG_KEYPAD == ONDAVX777_PAD
options.MENU = BUTTON_POWER;
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
options.UP = BUTTON_UP;
options.DOWN = BUTTON_DOWN;

2
apps/plugins/rockpaint.c
View File

@ -199,7 +199,7 @@
#elif CONFIG_KEYPAD == MROBE500_PAD
#define ROCKPAINT_QUIT BUTTON_POWER
#elif ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD )
#elif ( CONFIG_KEYPAD == SAMSUNG_YH92X_PAD )
#define ROCKPAINT_QUIT ( BUTTON_REW | BUTTON_REPEAT )
#define ROCKPAINT_DRAW BUTTON_PLAY
#define ROCKPAINT_MENU ( BUTTON_REW | BUTTON_REL )

2
apps/plugins/sliding_puzzle.c
View File

@ -220,7 +220,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PUZZLE_QUIT_TEXT "[POWER]"
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define PUZZLE_QUIT BUTTON_REW
#define PUZZLE_LEFT BUTTON_LEFT
#define PUZZLE_RIGHT BUTTON_RIGHT

2
apps/plugins/snake.c
View File

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

2
apps/plugins/snake2.c
View File

@ -323,7 +323,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define SNAKE2_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define SNAKE2_LEFT BUTTON_LEFT
#define SNAKE2_RIGHT BUTTON_RIGHT
#define SNAKE2_UP BUTTON_UP

4
apps/plugins/sokoban.c
View File

@ -490,7 +490,7 @@
#define BUTTON_SAVE BUTTON_PLAY
#define BUTTON_SAVE_NAME "PLAY"
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define SOKOBAN_LEFT BUTTON_LEFT
#define SOKOBAN_RIGHT BUTTON_RIGHT
#define SOKOBAN_UP BUTTON_UP
@ -1622,7 +1622,7 @@ static int sokoban_menu(void)
rb->lcd_putsxy(3, 36, "[VOL-] Previous Level");
rb->lcd_putsxy(3, 46, "[NEXT+PREV] Restart Level");
rb->lcd_putsxy(3, 56, "[VOL+] Next Level");
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
rb->lcd_putsxy(3, 6, "[PLAY] Menu");
rb->lcd_putsxy(3, 16, "[REW] Undo");
rb->lcd_putsxy(3, 26, "[FFWD] Redo");

2
apps/plugins/solitaire.c
View File

@ -469,7 +469,7 @@ CONFIG_KEYPAD == MROBE500_PAD
# define HK_CUR2STACK "REC+UP"
# define HK_REM2STACK "REC+RIGHT"
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
# define SOL_QUIT BUTTON_REW
# define SOL_UP BUTTON_UP
# define SOL_DOWN BUTTON_DOWN

2
apps/plugins/spacerocks.c
View File

@ -230,7 +230,7 @@
#define AST_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define AST_PAUSE BUTTON_FFWD
#define AST_QUIT BUTTON_REW

2
apps/plugins/splitedit.c
View File

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

2
apps/plugins/star.c
View File

@ -409,7 +409,7 @@
#define STAR_LEVEL_DOWN_NAME "REC+DOWN"
#define STAR_LEVEL_REPEAT_NAME "LONG FFWD"
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define STAR_QUIT (BUTTON_REW|BUTTON_REPEAT)
#define STAR_LEFT BUTTON_LEFT

2
apps/plugins/stopwatch.c
View File

@ -224,7 +224,7 @@
#define STOPWATCH_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define STOPWATCH_QUIT BUTTON_REW
#define STOPWATCH_START_STOP BUTTON_PLAY
#define STOPWATCH_RESET_TIMER BUTTON_LEFT

2
apps/plugins/sudoku/sudoku.h
View File

@ -282,7 +282,7 @@
#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
#define SUDOKU_BUTTON_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define SUDOKU_BUTTON_UP BUTTON_UP
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
#define SUDOKU_BUTTON_LEFT BUTTON_LEFT

2
apps/plugins/text_editor.c
View File

@ -459,7 +459,7 @@ enum plugin_status plugin_start(const void* parameter)
case ACTION_STD_CONTEXT:
/* These targets have unintuitive STD_MENU keymaps, so we use context keymap instead;
We don't need the "delete line" action, since this can be done via the menu. */
#if !(defined(SAMSUNG_YH920_PAD) || defined(SAMSUNG_YH820_PAD))
#if !(defined(SAMSUNG_YH92X_PAD) || defined(SAMSUNG_YH820_PAD))
if (!line_count) break;
rb->strlcpy(copy_buffer, do_action(ACTION_GET, 0, cur_sel),
MAX_LINE_LEN);

2
apps/plugins/text_viewer/tv_button.h
View File

@ -381,7 +381,7 @@
#define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER)
/* SAMSUNG YH-920 / YH-925 keys */
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define TV_QUIT (BUTTON_REW|BUTTON_REPEAT)
#define TV_SCROLL_UP BUTTON_UP
#define TV_SCROLL_DOWN BUTTON_DOWN

2
apps/plugins/vu_meter.c
View File

@ -284,7 +284,7 @@
#define LABEL_QUIT "POWER"
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define VUMETER_QUIT BUTTON_REW
#define VUMETER_HELP BUTTON_PLAY
#define VUMETER_MENU BUTTON_LEFT

2
apps/plugins/wormlet.c
View File

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

2
apps/plugins/xobox.c
View File

@ -233,7 +233,7 @@ CONFIG_KEYPAD == MROBE500_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
CONFIG_KEYPAD == SAMSUNG_YH920_PAD
CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
#define QUIT BUTTON_REW
#define LEFT BUTTON_LEFT

4
apps/plugins/xworld/keymaps.h
View File

@ -36,7 +36,7 @@
(CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \
(CONFIG_KEYPAD == GIGABEAT_PAD) || \
(CONFIG_KEYPAD == GIGABEAT_S_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \
(CONFIG_KEYPAD == CREATIVE_ZEN_PAD) || \
@ -79,7 +79,7 @@
#define BTN_FIRE BUTTON_HOME
#define BTN_PAUSE BUTTON_SELECT
#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define BTN_FIRE BUTTON_FFWD
#define BTN_PAUSE BUTTON_REW

2
apps/plugins/zxbox/keymaps.h
View File

@ -191,7 +191,7 @@
#define ZX_MENU BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define ZX_UP BUTTON_UP
#define ZX_DOWN BUTTON_DOWN

2
apps/plugins/zxbox/zxbox_keyb.c
View File

@ -198,7 +198,7 @@
#define KBD_DOWN BUTTON_DOWN
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
#define KBD_SELECT BUTTON_PLAY
#define KBD_ABORT BUTTON_REW

2
apps/radio/radio.c
View File

@ -93,7 +93,7 @@
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) ||\
(CONFIG_KEYPAD == SANSA_FUZE_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD) ||\
(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)||(CONFIG_KEYPAD == COWON_D2_PAD)||\
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)||(CONFIG_KEYPAD == MPIO_HD200_PAD)||\
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)||(CONFIG_KEYPAD == MPIO_HD200_PAD)||\
(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)
#define FM_MENU
#define FM_PRESET

2
apps/recorder/keyboard.c
View File

@ -69,7 +69,7 @@
|| (CONFIG_KEYPAD == PBELL_VIBE500_PAD) \
|| (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
|| (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
|| (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
/* certain key combos toggle input mode between keyboard input and Morse input */
#define KBD_TOGGLE_INPUT

2
bootloader/main-pp.c
View File

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

2
firmware/export/config.h
View File

@ -163,7 +163,7 @@
#define SAMSUNG_YPZ5_PAD 59
#define IHIFI_PAD 60
#define SAMSUNG_YPR1_PAD 61
#define SAMSUNG_YH920_PAD 62
#define SAMSUNG_YH92X_PAD 62
#define DX50_PAD 63
/* CONFIG_REMOTE_KEYPAD */

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_YH920_PAD
#define CONFIG_KEYPAD SAMSUNG_YH92X_PAD
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT

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_YH920_PAD
#define CONFIG_KEYPAD SAMSUNG_YH92X_PAD
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT

2
firmware/target/arm/pp/debug-pp.c
View File

@ -52,7 +52,7 @@
# define DEBUG_CANCEL BUTTON_POWER
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
# define DEBUG_CANCEL BUTTON_PLAY
#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)

2
uisimulator/buttonmap/SOURCES
View File

@ -59,7 +59,7 @@ onda-vx747.c
onda-vx777.c
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
samsung-yh820.c
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
samsung-yh92x.c
#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
pbell-vibe500.c