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

Cowon D2: Rename COWOND2_PAD -> COWON_D2_PAD to match macro used in manual, and

Browse source 
to target naming conventions in general


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24010 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-12-15 20:51:41 +00:00
parent 5ce515c315
commit 47ddbaa47b
69 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/SOURCES
View file

@ -227,7 +227,7 @@ keymaps/keymap-av300.c
keymaps/keymap-mr500.c
#elif CONFIG_KEYPAD == MROBE100_PAD
keymaps/keymap-mr100.c
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
keymaps/keymap-cowond2.c
#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
keymaps/keymap-meizu-m6sl.c

2
apps/plugins/battery_bench.c
View file

@ -155,7 +155,7 @@ PLUGIN_HEADER
#define BATTERY_ON_TXT "PLAY - start"
#define BATTERY_OFF_TXT "REC"
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define BATTERY_OFF BUTTON_POWER
#define BATTERY_OFF_TXT "POWER"

2
apps/plugins/blackjack.c
View file

@ -351,7 +351,7 @@ enum {
#define BJACK_RIGHT BUTTON_RC_FF
#define BJACK_LEFT BUTTON_RC_REW
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define BJACK_QUIT_NAME "POWER"
#define BJACK_DOUBLE_NAME "-"
#define BJACK_QUIT BUTTON_POWER

2
apps/plugins/bounce.c
View file

@ -150,7 +150,7 @@ PLUGIN_HEADER
#define BOUNCE_QUIT BUTTON_RC_REC
#define BOUNCE_MODE BUTTON_RC_MODE
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define BOUNCE_QUIT BUTTON_POWER
#define BOUNCE_MODE BUTTON_MENU

2
apps/plugins/brickmania.c
View file

@ -200,7 +200,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define UP BUTTON_UP
#define DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == ONDAVX747_PAD

2
apps/plugins/calculator.c
View file

@ -290,7 +290,7 @@ PLUGIN_HEADER
#define CALCULATOR_RC_QUIT BUTTON_REC
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define CALCULATOR_QUIT BUTTON_POWER
#define CALCULATOR_CLEAR BUTTON_MENU

2
apps/plugins/calendar.c
View file

@ -182,7 +182,7 @@ PLUGIN_HEADER
#define CALENDAR_NEXT_MONTH BUTTON_RC_MODE
#define CALENDAR_PREV_MONTH BUTTON_RC_MENU
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define CALENDAR_QUIT BUTTON_POWER
#define CALENDAR_SELECT BUTTON_CENTER
#define CALENDAR_NEXT_WEEK BUTTON_DOWN

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

@ -297,7 +297,7 @@
#define CB_RC_QUIT BUTTON_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define CB_LEVEL BUTTON_PLUS
#define CB_RESTART BUTTON_MINUS
#define CB_MENU (BUTTON_MENU|BUTTON_REL)

2
apps/plugins/chessclock.c
View file

@ -195,7 +195,7 @@ PLUGIN_HEADER
#define CHC_SETTINGS_OK BUTTON_RC_PLAY
#define CHC_SETTINGS_CANCEL BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define CHC_QUIT BUTTON_POWER
#define CHC_RESET (BUTTON_CENTER|BUTTON_MENU)
#define CHC_MENU BUTTON_MENU

2
apps/plugins/chip8.c
View file

@ -1077,7 +1077,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define CHIP8_KEY6 BUTTON_RC_FF
#define CHIP8_KEY8 BUTTON_RC_VOL_DOWN
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define CHIP8_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/chopper.c
View file

@ -113,7 +113,7 @@ Still To do:
#define ACTION2 BUTTON_RC_MODE
#define ACTIONTEXT "PLAY"
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

2
apps/plugins/clix.c
View file

@ -146,7 +146,7 @@ PLUGIN_HEADER
#define CLIX_BUTTON_UP BUTTON_UP
#define CLIX_BUTTON_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define CLIX_BUTTON_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == ONDAVX747_PAD)

2
apps/plugins/cube.c
View file

@ -206,7 +206,7 @@ PLUGIN_HEADER
#define CUBE_PAUSE BUTTON_RC_PLAY
#define CUBE_HIGHSPEED BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define CUBE_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == IAUDIO67_PAD)

2
apps/plugins/dict.c
View file

@ -132,7 +132,7 @@ long reverse (long N) {
#define LP_QUIT BUTTON_BACK
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
#define LP_QUIT BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define LP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD
#define LP_QUIT BUTTON_POWER

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

@ -275,7 +275,7 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_SHOOT BUTTON_RC_MODE
#define DOOMBUTTON_ENTER BUTTON_RC_PLAY
#define DOOMBUTTON_WEAPON BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define DOOMBUTTON_ESC BUTTON_POWER
#define DOOMBUTTON_SHOOT BUTTON_PLUS
#define DOOMBUTTON_WEAPON BUTTON_MINUS

2
apps/plugins/fireworks.c
View file

@ -84,7 +84,7 @@ PLUGIN_HEADER
#define BTN_MENU BUTTON_RC_REC
#define BTN_FIRE BUTTON_RC_PLAY
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define BTN_MENU (BUTTON_MENU|BUTTON_REL)
#elif CONFIG_KEYPAD == IAUDIO67_PAD

2
apps/plugins/flipit.c
View file

@ -248,7 +248,7 @@ PLUGIN_HEADER
#define FLIPIT_RC_QUIT BUTTON_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define FLIPIT_QUIT BUTTON_POWER

2
apps/plugins/invadrox.c
View file

@ -154,7 +154,7 @@ PLUGIN_HEADER
#define RIGHT BUTTON_RIGHT
#define FIRE BUTTON_SELECT
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define QUIT BUTTON_POWER
#define LEFT BUTTON_MINUS

2
apps/plugins/jewels.c
View file

@ -207,7 +207,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define JEWELS_RC_CANCEL BUTTON_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define JEWELS_CANCEL BUTTON_POWER
#define HK_CANCEL "POWER"

2
apps/plugins/jpeg/jpeg.h
View file

@ -241,7 +241,7 @@
#define JPEG_NEXT BUTTON_RC_MODE
#define JPEG_PREVIOUS BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#elif CONFIG_KEYPAD == IAUDIO67_PAD
#define JPEG_ZOOM_IN BUTTON_VOLUP

2
apps/plugins/lamp.c
View file

@ -72,7 +72,7 @@ PLUGIN_HEADER
# define LAMP_LEFT BUTTON_LEFT
# define LAMP_RIGHT BUTTON_RIGHT
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#elif CONFIG_KEYPAD == IAUDIO67_PAD
# define LAMP_LEFT BUTTON_LEFT

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

@ -151,7 +151,7 @@ const struct button_mapping generic_directions[] =
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == MROBE500_PAD)
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
{ PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE},
{ PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE},
@ -282,7 +282,7 @@ const struct button_mapping generic_left_right_fire[] =
{ PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE},
{ PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
{ PLA_LEFT, BUTTON_MINUS, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT, BUTTON_PLUS, BUTTON_NONE},
@ -445,7 +445,7 @@ const struct button_mapping generic_actions[] =
{PLA_MENU, BUTTON_MENU, BUTTON_NONE},
{PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
{PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
{PLA_START, BUTTON_MINUS, BUTTON_NONE},
{PLA_MENU, BUTTON_MENU, BUTTON_NONE},
@ -564,7 +564,7 @@ const struct button_mapping generic_increase_decrease[] =
{PLA_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE},
{PLA_INC_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
{PLA_DEC_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
{PLA_INC, BUTTON_PLUS, BUTTON_NONE},
{PLA_DEC, BUTTON_MINUS, BUTTON_NONE},
{PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE},

2
apps/plugins/logo.c
View file

@ -143,7 +143,7 @@ const unsigned char rockbox16x7[] = {
#define LP_DEC_Y BUTTON_RC_VOL_DOWN
#define LP_INC_Y BUTTON_RC_VOL_UP
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define LP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

2
apps/plugins/mandelbrot.c
View file

@ -256,7 +256,7 @@ PLUGIN_HEADER
#define MANDELBROT_MAXITER_DEC (BUTTON_RC_MODE|BUTTON_REPEAT)
#define MANDELBROT_RESET BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define MANDELBROT_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/matrix.c
View file

@ -112,7 +112,7 @@ PLUGIN_HEADER
#define MATRIX_SLEEP_LESS BUTTON_RC_VOL_DOWN
#define MATRIX_PAUSE BUTTON_RC_PLAY
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define MATRIX_EXIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

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

@ -139,7 +139,7 @@ PLUGIN_IRAM_DECLARE
#define BTN_PLAY BUTTON_RC_PLAY
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define BTN_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

2
apps/plugins/minesweeper.c
View file

@ -201,7 +201,7 @@ enum minesweeper_status {
# define MINESWP_DISCOVER BUTTON_RC_PLAY
# define MINESWP_INFO BUTTON_RC_MENU
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
# define MINESWP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/mosaique.c
View file

@ -129,7 +129,7 @@ PLUGIN_HEADER
#define MOSAIQUE_SPEED BUTTON_RC_MENU
#define MOSAIQUE_RESTART BUTTON_RC_PLAY
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define MOSAIQUE_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

2
apps/plugins/mp3_encoder.c
View file

@ -2467,7 +2467,7 @@ void get_mp3_filename(const char *wav_name)
#define MP3ENC_DONE BUTTON_RC_REC
#define MP3ENC_SELECT BUTTON_RC_FF
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define MP3ENC_DONE BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

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

@ -139,7 +139,7 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_DOWN BUTTON_RC_VOL_DOWN
#define MPEG_START_TIME_EXIT BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define MPEG_START_TIME_EXIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

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

@ -246,7 +246,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define MPEG_RW BUTTON_RC_REW
#define MPEG_FF BUTTON_RC_FF
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define MPEG_MENU (BUTTON_MENU|BUTTON_REL)
//#define MPEG_STOP BUTTON_POWER
#define MPEG_VOLDOWN BUTTON_MINUS

2
apps/plugins/oscilloscope.c
View file

@ -216,7 +216,7 @@ PLUGIN_HEADER
#define OSCILLOSCOPE_VOL_UP BUTTON_RC_VOL_UP
#define OSCILLOSCOPE_VOL_DOWN BUTTON_RC_VOL_DOWN
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define OSCILLOSCOPE_QUIT BUTTON_POWER
#define OSCILLOSCOPE_VOL_UP BUTTON_PLUS
#define OSCILLOSCOPE_VOL_DOWN BUTTON_MINUS

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

@ -154,7 +154,7 @@
#define PACMAN_COIN (BUTTON_RC_MODE | BUTTON_RC_DOWN)
#define PACMAN_MENU BUTTON_POWER
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL)

2
apps/plugins/pegbox.c
View file

@ -317,7 +317,7 @@ PLUGIN_HEADER
#define LVL_UP_TEXT "VOL+"
#define LVL_DOWN_TEXT "VOL-"
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define PEGBOX_QUIT BUTTON_POWER
#define QUIT_TEXT "POWER"

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

@ -122,9 +122,9 @@ const struct button_mapping pf_context_buttons[] =
/* These all use short press of BUTTON_POWER for menu, map long POWER to quit
*/
#elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_M200_PAD || \
CONFIG_KEYPAD == IRIVER_H10_PAD || CONFIG_KEYPAD == COWOND2_PAD
CONFIG_KEYPAD == IRIVER_H10_PAD || CONFIG_KEYPAD == COWON_D2_PAD
{PF_QUIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER},
#if CONFIG_KEYPAD == COWOND2_PAD
#if CONFIG_KEYPAD == COWON_D2_PAD
{PF_BACK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER},
{ACTION_NONE, BUTTON_POWER, BUTTON_NONE},
#endif

2
apps/plugins/plasma.c
View file

@ -127,7 +127,7 @@ static bool boosted = false;
#define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN
#define PLASMA_RC_QUIT BUTTON_REC
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define PLASMA_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == IAUDIO67_PAD)

2
apps/plugins/png/png.h
View file

@ -262,7 +262,7 @@ You are free to name this file lodepng.cpp or lodepng.c depending on your usage.
#define PNG_NEXT BUTTON_RC_MODE
#define PNG_PREVIOUS BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#elif CONFIG_KEYPAD == IAUDIO67_PAD
#define PNG_ZOOM_IN BUTTON_VOLUP

2
apps/plugins/pong.c
View file

@ -158,7 +158,7 @@ PLUGIN_HEADER
#define PONG_RIGHT_UP BUTTON_VOL_UP
#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define PONG_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

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

@ -151,7 +151,7 @@
#define REVERSI_BUTTON_MAKE_MOVE BUTTON_RC_PLAY
#define REVERSI_BUTTON_MENU BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define REVERSI_BUTTON_QUIT BUTTON_POWER
#define REVERSI_BUTTON_MENU BUTTON_MENU

2
apps/plugins/rockblox.c
View file

@ -248,7 +248,7 @@ PLUGIN_HEADER
#define ROCKBLOX_DROP BUTTON_RC_PLAY
#define ROCKBLOX_RESTART BUTTON_RC_MODE
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_RESTART BUTTON_MENU

2
apps/plugins/rockblox1d.c
View file

@ -85,7 +85,7 @@ PLUGIN_HEADER
#define ONEDROCKBLOX_DOWN BUTTON_RC_PLAY
#define ONEDROCKBLOX_QUIT BUTTON_RC_REC
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define ONEDROCKBLOX_DOWN BUTTON_MENU
#define ONEDROCKBLOX_QUIT BUTTON_POWER

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

@ -196,7 +196,7 @@ static void setoptions (void)
#elif CONFIG_KEYPAD == MROBE500_PAD
options.MENU=BUTTON_POWER;
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
options.A=BUTTON_PLUS;
options.B=BUTTON_MINUS;
options.MENU=BUTTON_MENU;
@ -280,7 +280,7 @@ static void setoptions (void)
#if CONFIG_KEYPAD == MROBE500_PAD
options.A=BUTTON_BOTTOMLEFT;
options.B=BUTTON_BOTTOMRIGHT;
#elif CONFIG_KEYPAD != COWOND2_PAD
#elif CONFIG_KEYPAD != COWON_D2_PAD
options.A=BUTTON_BOTTOMLEFT;
options.B=BUTTON_BOTTOMRIGHT;
options.MENU=BUTTON_TOPLEFT;

2
apps/plugins/rockpaint.c
View file

@ -129,7 +129,7 @@ PLUGIN_HEADER
#define ROCKPAINT_LEFT BUTTON_LEFT
#define ROCKPAINT_RIGHT BUTTON_RIGHT
#elif ( CONFIG_KEYPAD == COWOND2_PAD )
#elif ( CONFIG_KEYPAD == COWON_D2_PAD )
#define ROCKPAINT_QUIT BUTTON_POWER
#define ROCKPAINT_MENU BUTTON_MENU

2
apps/plugins/sliding_puzzle.c
View file

@ -166,7 +166,7 @@ PLUGIN_HEADER
#define PUZZLE_SHUFFLE BUTTON_RC_MODE
#define PUZZLE_PICTURE BUTTON_RC_MENU
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define PUZZLE_QUIT BUTTON_POWER
#define PUZZLE_QUIT_TEXT "[POWER]"

2
apps/plugins/snake.c
View file

@ -196,7 +196,7 @@ PLUGIN_HEADER
#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
#define SNAKE_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define SNAKE_QUIT BUTTON_POWER
#else

2
apps/plugins/snake2.c
View file

@ -264,7 +264,7 @@ PLUGIN_HEADER
#define SNAKE2_PLAYPAUSE BUTTON_RC_PLAY
#define SNAKE2_PLAYPAUSE_TEXT "Play"
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define SNAKE2_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/snow.c
View file

@ -55,7 +55,7 @@ PLUGIN_HEADER
(CONFIG_KEYPAD == MROBE500_PAD) || \
(CONFIG_KEYPAD == IRIVER_H10_PAD) || \
(CONFIG_KEYPAD == MROBE100_PAD) || \
(CONFIG_KEYPAD == COWOND2_PAD) || \
(CONFIG_KEYPAD == COWON_D2_PAD) || \
(CONFIG_KEYPAD == IAUDIO67_PAD) || \
(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
(CONFIG_KEYPAD == ONDAVX747_PAD) || \

2
apps/plugins/sokoban.c
View file

@ -328,7 +328,7 @@ PLUGIN_HEADER
#define SOKOBAN_RC_MENU BUTTON_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define SOKOBAN_MENU BUTTON_MENU
#define SOKOBAN_LEVEL_DOWN BUTTON_MINUS
#define SOKOBAN_LEVEL_UP BUTTON_PLUS

2
apps/plugins/solitaire.c
View file

@ -356,7 +356,7 @@ PLUGIN_HEADER
# define HK_CUR2STACK "MODE"
# define HK_REM2STACK "MODE.."
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
# define SOL_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/spacerocks.c
View file

@ -176,7 +176,7 @@ PLUGIN_HEADER
#define AST_RIGHT BUTTON_RC_FF
#define AST_FIRE BUTTON_RC_MODE
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define AST_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/star.c
View file

@ -288,7 +288,7 @@ PLUGIN_HEADER
#define STAR_LEVEL_DOWN_NAME "PLAY+VOL-"
#define STAR_LEVEL_REPEAT_NAME "PLAY+MENU"
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define STAR_QUIT BUTTON_POWER
#define STAR_QUIT_NAME "POWER"

2
apps/plugins/starfield.c
View file

@ -112,7 +112,7 @@ PLUGIN_HEADER
#define STARFIELD_DECREASE_NB_STARS BUTTON_RIGHT
#define STARFIELD_TOGGLE_COLOR BUTTON_MENU
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define STARFIELD_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/stats.c
View file

@ -82,7 +82,7 @@ static bool abort;
#define STATS_STOP BUTTON_REC
#define STATS_STOP_REMOTE BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define STATS_STOP BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

2
apps/plugins/stopwatch.c
View file

@ -166,7 +166,7 @@ PLUGIN_HEADER
#define STOPWATCH_SCROLL_DOWN BUTTON_RC_VOL_DOWN
#define STOPWATCH_RC_QUIT BUTTON_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define STOPWATCH_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IAUDIO67_PAD

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

@ -210,7 +210,7 @@
#define SUDOKU_BUTTON_MENU BUTTON_RC_MENU
#define SUDOKU_BUTTON_POSSIBLE BUTTON_RC_PLAY
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define SUDOKU_BUTTON_QUIT BUTTON_POWER
#define SUDOKU_BUTTON_MENU BUTTON_MENU

2
apps/plugins/superdom.c
View file

@ -128,7 +128,7 @@ char buf[255];
#define SUPERDOM_RIGHT BUTTON_RIGHT
#define SUPERDOM_CANCEL BUTTON_BACK
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define SUPERDOM_CANCEL BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD

2
apps/plugins/test_codec.c
View file

@ -30,7 +30,7 @@ PLUGIN_HEADER
#define TESTCODEC_EXITBUTTON BUTTON_RC_PLAY
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#define TESTCODEC_EXITBUTTON BUTTON_PLAY
#elif CONFIG_KEYPAD == COWOND2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD
#define TESTCODEC_EXITBUTTON BUTTON_POWER
#elif defined(HAVE_TOUCHSCREEN)
#define TESTCODEC_EXITBUTTON BUTTON_TOPLEFT

2
apps/plugins/test_touchscreen.c
View file

@ -22,7 +22,7 @@
PLUGIN_HEADER
#if (CONFIG_KEYPAD == COWOND2_PAD)
#if (CONFIG_KEYPAD == COWON_D2_PAD)
#define TOUCHSCREEN_QUIT BUTTON_POWER
#define TOUCHSCREEN_TOGGLE BUTTON_MENU
#elif (CONFIG_KEYPAD == MROBE500_PAD)

2
apps/plugins/viewer.c
View file

@ -290,7 +290,7 @@ PLUGIN_HEADER
#define VIEWER_RC_QUIT BUTTON_REC
/* Cowon D2 keys */
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define VIEWER_QUIT BUTTON_POWER
#define VIEWER_MENU BUTTON_MENU

2
apps/plugins/vu_meter.c
View file

@ -240,7 +240,7 @@ PLUGIN_HEADER
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "VOL UP/DN"
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define VUMETER_QUIT BUTTON_POWER
#define VUMETER_MENU BUTTON_MENU
#define VUMETER_MENU_EXIT BUTTON_POWER

2
apps/plugins/wormlet.c
View file

@ -208,7 +208,7 @@ PLUGIN_HEADER
#define BTN_QUIT BUTTON_RC_REC
#define BTN_STOPRESET BUTTON_RC_MODE
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define BTN_QUIT BUTTON_POWER

2
apps/plugins/xobox.c
View file

@ -168,7 +168,7 @@ PLUGIN_HEADER
#define DOWN BUTTON_RC_VOL_DOWN
#define PAUSE BUTTON_RC_PLAY
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define QUIT BUTTON_POWER

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

@ -129,7 +129,7 @@
#define ZX_SELECT BUTTON_RC_PLAY
#define ZX_MENU BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define ZX_MENU (BUTTON_MENU|BUTTON_REL)
#elif CONFIG_KEYPAD == IAUDIO67_PAD

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

@ -135,7 +135,7 @@
#define KBD_UP BUTTON_RC_VOL_UP
#define KBD_DOWN BUTTON_RC_VOL_DOWN
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define KBD_ABORT BUTTON_POWER

2
apps/recorder/radio.c
View file

@ -110,7 +110,7 @@
#define FM_PRESET
#define FM_MODE
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
#define FM_MENU
#define FM_PRESET
#define FM_STOP

2
firmware/export/config.h
View file

@ -94,7 +94,7 @@
#define GIGABEAT_S_PAD 19
#define LOGIK_DAX_PAD 20
#define IAUDIO67_PAD 21
#define COWOND2_PAD 22
#define COWON_D2_PAD 22
#define IAUDIO_M3_PAD 23
#define CREATIVEZVM_PAD 24
#define SANSA_M200_PAD 25

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

@ -82,7 +82,7 @@
#define HAVE_LCD_ENABLE
/* define this to indicate your device's keypad */
#define CONFIG_KEYPAD COWOND2_PAD
#define CONFIG_KEYPAD COWON_D2_PAD
#define HAVE_TOUCHSCREEN
#define HAVE_BUTTON_DATA

2
firmware/export/usb.h
View file

@ -89,7 +89,7 @@ enum {
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#define USBPOWER_BUTTON BUTTON_RIGHT
#define USBPOWER_BTN_IGNORE BUTTON_LEFT
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
#define USBPOWER_BUTTON BUTTON_MENU
#define USBPOWER_BTN_IGNORE BUTTON_MINUS
#endif

2
uisimulator/sdl/button.c
View file

@ -782,7 +782,7 @@ void button_event(int key, bool pressed)
new_btn = BUTTON_POWER;
break;
#elif CONFIG_KEYPAD == COWOND2_PAD
#elif CONFIG_KEYPAD == COWON_D2_PAD
case SDLK_ESCAPE:
new_btn = BUTTON_POWER;
break;