From 47ddbaa47b1ccb4d4391fb0be40352818b22b735 Mon Sep 17 00:00:00 2001 From: Tomer Shalev Date: Tue, 15 Dec 2009 20:51:41 +0000 Subject: Cowon D2: Rename COWOND2_PAD -> COWON_D2_PAD to match macro used in manual, and to target naming conventions in general git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24010 a1c6a512-1295-4272-9138-f99709370657 --- apps/SOURCES | 2 +- apps/plugins/battery_bench.c | 2 +- apps/plugins/blackjack.c | 2 +- apps/plugins/bounce.c | 2 +- apps/plugins/brickmania.c | 2 +- apps/plugins/calculator.c | 2 +- apps/plugins/calendar.c | 2 +- apps/plugins/chessbox/chessbox_pgn.h | 2 +- apps/plugins/chessclock.c | 2 +- apps/plugins/chip8.c | 2 +- apps/plugins/chopper.c | 2 +- apps/plugins/clix.c | 2 +- apps/plugins/cube.c | 2 +- apps/plugins/dict.c | 2 +- apps/plugins/doom/i_video.c | 2 +- apps/plugins/fireworks.c | 2 +- apps/plugins/flipit.c | 2 +- apps/plugins/invadrox.c | 2 +- apps/plugins/jewels.c | 2 +- apps/plugins/jpeg/jpeg.h | 2 +- apps/plugins/lamp.c | 2 +- apps/plugins/lib/pluginlib_actions.c | 8 ++++---- apps/plugins/logo.c | 2 +- apps/plugins/mandelbrot.c | 2 +- apps/plugins/matrix.c | 2 +- apps/plugins/midi/midiplay.c | 2 +- apps/plugins/minesweeper.c | 2 +- apps/plugins/mosaique.c | 2 +- apps/plugins/mp3_encoder.c | 2 +- apps/plugins/mpegplayer/mpeg_settings.c | 2 +- apps/plugins/mpegplayer/mpegplayer.c | 2 +- apps/plugins/oscilloscope.c | 2 +- apps/plugins/pacbox/pacbox.h | 2 +- apps/plugins/pegbox.c | 2 +- apps/plugins/pictureflow/pictureflow.c | 4 ++-- apps/plugins/plasma.c | 2 +- apps/plugins/png/png.h | 2 +- apps/plugins/pong.c | 2 +- apps/plugins/reversi/reversi-gui.h | 2 +- apps/plugins/rockblox.c | 2 +- apps/plugins/rockblox1d.c | 2 +- apps/plugins/rockboy/rockboy.c | 4 ++-- apps/plugins/rockpaint.c | 2 +- apps/plugins/sliding_puzzle.c | 2 +- apps/plugins/snake.c | 2 +- apps/plugins/snake2.c | 2 +- apps/plugins/snow.c | 2 +- apps/plugins/sokoban.c | 2 +- apps/plugins/solitaire.c | 2 +- apps/plugins/spacerocks.c | 2 +- apps/plugins/star.c | 2 +- apps/plugins/starfield.c | 2 +- apps/plugins/stats.c | 2 +- apps/plugins/stopwatch.c | 2 +- apps/plugins/sudoku/sudoku.h | 2 +- apps/plugins/superdom.c | 2 +- apps/plugins/test_codec.c | 2 +- apps/plugins/test_touchscreen.c | 2 +- apps/plugins/viewer.c | 2 +- apps/plugins/vu_meter.c | 2 +- apps/plugins/wormlet.c | 2 +- apps/plugins/xobox.c | 2 +- apps/plugins/zxbox/keymaps.h | 2 +- apps/plugins/zxbox/zxbox_keyb.c | 2 +- apps/recorder/radio.c | 2 +- firmware/export/config.h | 2 +- firmware/export/config/cowond2.h | 2 +- firmware/export/usb.h | 2 +- uisimulator/sdl/button.c | 2 +- 69 files changed, 74 insertions(+), 74 deletions(-) diff --git a/apps/SOURCES b/apps/SOURCES index 3f44fddf67..313e5e0aec 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -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 diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 7257e2c26f..57545c2106 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -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" diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 93bd2396cb..3854799fc3 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -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 diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index d0a8e8b48d..eb513bca8e 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -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 diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index a372eb0813..5ea9ae7c60 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -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 diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 93bed2adcb..f7cafc8f24 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -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 diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index a7063b1f5b..1106c38d4b 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -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 diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index b7ff3f5b0c..0d3574447a 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h @@ -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) diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 39b28628f0..ff33bda470 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -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 diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 80611ab085..f90030df32 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -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 diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 3233675c23..c7c5c38c72 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -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 diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index e6b70b602a..e5f65ce36c 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c @@ -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) diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index c38ec08994..dadaa5df56 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -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) diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 8268e81811..2127186e72 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c @@ -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 diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 2e93c5460b..5f9d3041a2 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -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 diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 782cff5ba8..8a858d8d4f 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c @@ -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 diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 2165486080..da4acd70b6 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -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 diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 940c60ffa3..fcd1c2d950 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -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 diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 586caabfa5..6c718b4f99 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -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" diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index e3de47af1a..552d26ed1a 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h @@ -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 diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index 1c60cba78f..690676e054 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c @@ -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 diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index f93c7a4fe9..d587f80ba4 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -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}, diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index b80f67b271..04c8aa015b 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -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 diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index c7d39763c5..091de31afc 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c @@ -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 diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 9c2e424476..ee66135862 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c @@ -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 diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index c444511f2e..c8ae070cd0 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c @@ -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 diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 4f27af671e..cea31f19db 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -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 diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 4cdec8f396..a8bdeeeda9 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c @@ -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 diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index f36a270dbf..3dfb487653 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -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 diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 26d8414d8a..1ad1503d3f 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -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 diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 31b7c68373..7a2578506d 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -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 diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index b5ed705c91..1daac661b2 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -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 diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 85ec648a7a..203c0f5836 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -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) diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index c46a3de7bd..72b9f70c87 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -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" diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 9cd0d3459b..eab1d0a00a 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -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 diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index f57f209103..0b1cab2b13 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -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) diff --git a/apps/plugins/png/png.h b/apps/plugins/png/png.h index bdf7186a2c..50ae334ad0 100644 --- a/apps/plugins/png/png.h +++ b/apps/plugins/png/png.h @@ -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 diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 73fb48356b..579fdd8fe5 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -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 diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 1a5f5479df..a62f1fc3ba 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -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 diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index bbeb3ba0b4..95a793fb8c 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -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 diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index d9b055195e..245035bad3 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c @@ -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 diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 1d081f48d5..593ce828b4 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -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; diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index d562eb488e..57a23a34bd 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -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 diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 790acc8e6b..110f830aa1 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -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]" diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 461a862682..c32873fbc2 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -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 diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 7b518bdf8d..2a1e746f9d 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -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 diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 5fc1ed3804..c64dfd0a5c 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -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) || \ diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index dfab89fdb7..b9e0aa1d2e 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -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 diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 09407996c4..8d0b12eba6 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -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 diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 636aeddde7..4bcb75366c 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -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 diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 72a2e7a907..efd2dae6fe 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -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" diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 8630b41c7c..4a680ee91b 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -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 diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index e8a09ada3b..d3cf9dc5a7 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c @@ -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 diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index edc6441766..b7ed592fdf 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -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 diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 1f9b1958e8..57fd8c9a56 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -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 diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 69dc607090..4113ed7de2 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c @@ -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 diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c index 74d2e40fd2..e57af8cc0a 100644 --- a/apps/plugins/test_codec.c +++ b/apps/plugins/test_codec.c @@ -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 diff --git a/apps/plugins/test_touchscreen.c b/apps/plugins/test_touchscreen.c index ae7e453fd3..902a2bd089 100644 --- a/apps/plugins/test_touchscreen.c +++ b/apps/plugins/test_touchscreen.c @@ -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) diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 046c76523a..a212885540 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -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 diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 09c7c0ab6a..53455740a7 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -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 diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index bc7d8bf545..5a897be086 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -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 diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index a105e1a4b6..347270a4bd 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -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 diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index a1af98db3f..ed22c7225f 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -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 diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 4e41087e25..c3085e3714 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -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 diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index d49b94d434..d072cf6cde 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -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 diff --git a/firmware/export/config.h b/firmware/export/config.h index 303e5645df..3b50775faa 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -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 diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h index 88c7ce5b8f..465fe7a43b 100644 --- a/firmware/export/config/cowond2.h +++ b/firmware/export/config/cowond2.h @@ -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 diff --git a/firmware/export/usb.h b/firmware/export/usb.h index d432b39b14..9776248e2b 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h @@ -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 diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index e2bae1cf7b..2fbc41e373 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c @@ -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; -- cgit v1.2.3