summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Stec <nils.stec@gmail.com>2014-06-30 20:24:15 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2014-06-30 21:20:15 +0200
commitc9816f57bf8782fd2ce6487aa0dc0f739145b631 (patch)
treeaf0f7314182fb8ee278ced53b7f79615312f32d2
parent6e575b6c7011827c042cba7b27537c1ceec9ef24 (diff)
downloadrockbox-c9816f5.tar.gz
rockbox-c9816f5.tar.bz2
rockbox-c9816f5.zip
Introduce plugin keymaps for the Sony NWZ Series
Change-Id: I46b8766bd44118bce4931b7ee71815ae5f51cb2e Reviewed-on: http://gerrit.rockbox.org/879 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
-rw-r--r--apps/plugins/blackjack.c14
-rw-r--r--apps/plugins/brickmania.c8
-rw-r--r--apps/plugins/calculator.c10
-rw-r--r--apps/plugins/calendar.c10
-rw-r--r--apps/plugins/chessbox/chessbox_pgn.h11
-rw-r--r--apps/plugins/chessclock.c10
-rw-r--r--apps/plugins/chip8.c8
-rw-r--r--apps/plugins/chopper.c5
-rw-r--r--apps/plugins/clix.c10
-rw-r--r--apps/plugins/cube.c10
-rw-r--r--apps/plugins/doom/i_video.c12
-rw-r--r--apps/plugins/fft/fft.c9
-rw-r--r--apps/plugins/flipit.c11
-rw-r--r--apps/plugins/fractals/fractal.h13
-rw-r--r--apps/plugins/goban/goban.h8
-rw-r--r--apps/plugins/imageviewer/imageviewer_button.h12
-rw-r--r--apps/plugins/invadrox.c7
-rw-r--r--apps/plugins/jewels.c11
-rw-r--r--apps/plugins/midi/midiplay.c8
-rw-r--r--apps/plugins/minesweeper.c10
-rw-r--r--apps/plugins/mp3_encoder.c6
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c8
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
-rw-r--r--apps/plugins/oscilloscope.c11
-rw-r--r--apps/plugins/pacbox/pacbox.h9
-rw-r--r--apps/plugins/pegbox.c17
-rw-r--r--apps/plugins/pong.c8
-rw-r--r--apps/plugins/reversi/reversi-gui.h8
-rw-r--r--apps/plugins/rockblox.c10
-rw-r--r--apps/plugins/rockboy/rockboy.c13
-rw-r--r--apps/plugins/rockpaint.c11
-rw-r--r--apps/plugins/sliding_puzzle.c9
-rw-r--r--apps/plugins/snake.c8
-rw-r--r--apps/plugins/snake2.c10
-rw-r--r--apps/plugins/sokoban.c12
-rw-r--r--apps/plugins/solitaire.c17
-rw-r--r--apps/plugins/spacerocks.c9
-rw-r--r--apps/plugins/star.c16
-rw-r--r--apps/plugins/stopwatch.c8
-rw-r--r--apps/plugins/sudoku/sudoku.h10
-rw-r--r--apps/plugins/superdom.c8
-rw-r--r--apps/plugins/text_viewer/tv_button.h10
-rw-r--r--apps/plugins/vu_meter.c11
-rw-r--r--apps/plugins/wormlet.c9
-rw-r--r--apps/plugins/xobox.c8
-rw-r--r--apps/plugins/zxbox/keymaps.h8
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c8
-rwxr-xr-xtools/configure4
48 files changed, 470 insertions, 2 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index b54d40a717..206d4dca0c 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -513,6 +513,20 @@ enum {
#define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define BJACK_SELECT BUTTON_PLAY
+#define BJACK_QUIT BUTTON_BACK
+#define BJACK_STAY (BUTTON_POWER|BUTTON_PLAY)
+#define BJACK_DOUBLEDOWN (BUTTON_POWER|BUTTON_DOWN)
+#define BJACK_UP BUTTON_UP
+#define BJACK_DOWN BUTTON_DOWN
+#define BJACK_RIGHT BUTTON_RIGHT
+#define BJACK_LEFT BUTTON_LEFT
+#define BJACK_SELECT_NAME "Play"
+#define BJACK_STAY_NAME "Option+Play"
+#define BJACK_QUIT_NAME "Back"
+#define BJACK_DOUBLE_NAME "Option+Down"
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 1574fe7119..6cff61e004 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -295,6 +295,14 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
#define UP BUTTON_UP
#define DOWN BUTTON_DOWN
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define QUIT BUTTON_BACK
+#define LEFT BUTTON_LEFT
+#define RIGHT BUTTON_RIGHT
+#define SELECT BUTTON_PLAY
+#define UP BUTTON_UP
+#define DOWN BUTTON_DOWN
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 327ef69b45..5e5e7130a1 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -477,6 +477,16 @@ F3: equal to "="
#define CALCULATOR_CALC BUTTON_PLAY
#define CALCULATOR_CLEAR BUTTON_PREV
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define CALCULATOR_LEFT BUTTON_LEFT
+#define CALCULATOR_RIGHT BUTTON_RIGHT
+#define CALCULATOR_UP BUTTON_UP
+#define CALCULATOR_DOWN BUTTON_DOWN
+#define CALCULATOR_QUIT (BUTTON_BACK|BUTTON_REPEAT)
+#define CALCULATOR_INPUT BUTTON_PLAY
+#define CALCULATOR_CALC BUTTON_POWER
+#define CALCULATOR_CLEAR BUTTON_BACK
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 8e43823bb6..d586b4b48c 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -349,6 +349,16 @@
#define CALENDAR_NEXT_MONTH BUTTON_NEXT
#define CALENDAR_PREV_MONTH BUTTON_PREV
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define CALENDAR_QUIT BUTTON_BACK
+#define CALENDAR_SELECT BUTTON_PLAY
+#define CALENDAR_NEXT_DAY BUTTON_RIGHT
+#define CALENDAR_PREV_DAY BUTTON_LEFT
+#define CALENDAR_NEXT_WEEK BUTTON_DOWN
+#define CALENDAR_PREV_WEEK BUTTON_UP
+#define CALENDAR_NEXT_MONTH (BUTTON_POWER|BUTTON_DOWN)
+#define CALENDAR_PREV_MONTH (BUTTON_POWER|BUTTON_UP)
+
#else
#error "No keypad setting."
#endif
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 3cc136e566..1e8a9ec34f 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -464,6 +464,17 @@
#define CB_LEVEL BUTTON_PREV
#define CB_MENU BUTTON_POWER
+
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define CB_SELECT BUTTON_PLAY
+#define CB_UP BUTTON_UP
+#define CB_DOWN BUTTON_DOWN
+#define CB_LEFT BUTTON_LEFT
+#define CB_RIGHT BUTTON_RIGHT
+#define CB_PLAY (BUTTON_REPEAT|BUTTON_PLAY)
+#define CB_MENU BUTTON_BACK
+#define CB_LEVEL BUTTON_POWER
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index a58dc6bbce..490e588d91 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -367,6 +367,16 @@
#define CHC_SETTINGS_OK BUTTON_SELECT
#define CHC_SETTINGS_CANCEL BUTTON_PREV
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define CHC_QUIT BUTTON_BACK
+#define CHC_STARTSTOP BUTTON_PLAY
+#define CHC_RESET BUTTON_LEFT
+#define CHC_MENU BUTTON_POWER
+#define CHC_SETTINGS_INC BUTTON_UP
+#define CHC_SETTINGS_DEC BUTTON_DOWN
+#define CHC_SETTINGS_OK BUTTON_RIGHT
+#define CHC_SETTINGS_CANCEL BUTTON_BACK
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 63c9b7fa06..873ad37df3 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1231,6 +1231,14 @@ CONFIG_KEYPAD == MROBE500_PAD
#define CHIP8_KEY6 BUTTON_RIGHT
#define CHIP8_KEY8 BUTTON_LEFT
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define CHIP8_OFF BUTTON_BACK
+#define CHIP8_KEY2 BUTTON_UP
+#define CHIP8_KEY4 BUTTON_DOWN
+#define CHIP8_KEY5 BUTTON_PLAY
+#define CHIP8_KEY6 BUTTON_RIGHT
+#define CHIP8_KEY8 BUTTON_LEFT
+
#elif (CONFIG_KEYPAD == HM801_PAD)
#define CHIP8_OFF (BUTTON_POWER|BUTTON_SELECT)
#define CHIP8_KEY1 BUTTON_PREV
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index db836e5393..df578ffcac 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -193,6 +193,11 @@ CONFIG_KEYPAD == MROBE500_PAD
#define ACTION BUTTON_SELECT
#define ACTIONTEXT "SELECT"
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define QUIT BUTTON_BACK
+#define ACTION BUTTON_PLAY
+#define ACTIONTEXT "PLAY"
+
#elif !defined(HAVE_TOUCHSCREEN)
#error No keymap defined!
#endif
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 31951def28..47e27a8635 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -230,6 +230,16 @@
#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
#define CLIX_BUTTON_CLICK BUTTON_SELECT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define CLIX_BUTTON_QUIT BUTTON_BACK
+#define CLIX_BUTTON_UP BUTTON_UP
+#define CLIX_BUTTON_DOWN BUTTON_DOWN
+#define CLIX_BUTTON_SCROLL_FWD (BUTTON_POWER|BUTTON_RIGHT)
+#define CLIX_BUTTON_SCROLL_BACK (BUTTON_POWER|BUTTON_LEFT)
+#define CLIX_BUTTON_LEFT BUTTON_LEFT
+#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
+#define CLIX_BUTTON_CLICK BUTTON_PLAY
+
#elif (CONFIG_KEYPAD == SAMSUNG_YPR1_PAD)
#define CLIX_BUTTON_QUIT BUTTON_POWER
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index b75c1f21c8..de548ce308 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -370,6 +370,16 @@
#define CUBE_PAUSE BUTTON_SELECT
#define CUBE_HIGHSPEED BUTTON_NEXT
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define CUBE_QUIT BUTTON_BACK
+#define CUBE_NEXT BUTTON_RIGHT
+#define CUBE_PREV BUTTON_LEFT
+#define CUBE_INC BUTTON_UP
+#define CUBE_DEC BUTTON_DOWN
+#define CUBE_MODE (BUTTON_POWER|BUTTON_UP)
+#define CUBE_PAUSE BUTTON_PLAY
+#define CUBE_HIGHSPEED (BUTTON_POWER|BUTTON_DOWN)
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 200a663494..90ee93cd17 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -499,6 +499,18 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_WEAPON BUTTON_PREV
#define DOOMBUTTON_MAP BUTTON_NEXT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define DOOMBUTTON_UP BUTTON_UP
+#define DOOMBUTTON_DOWN BUTTON_DOWN
+#define DOOMBUTTON_LEFT BUTTON_LEFT
+#define DOOMBUTTON_RIGHT BUTTON_RIGHT
+#define DOOMBUTTON_OPEN BUTTON_BACK
+#define DOOMBUTTON_ESC (BUTTON_BACK|BUTTON_REPEAT)
+#define DOOMBUTTON_ENTER BUTTON_PLAY
+#define DOOMBUTTON_SHOOT BUTTON_PLAY
+#define DOOMBUTTON_WEAPON BUTTON_POWER
+#define DOOMBUTTON_MAP (BUTTON_POWER|BUTTON_REPEAT)
+
#else
#error Keymap not defined!
#endif
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 2b7f6a4fbe..28c3cd045c 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -302,6 +302,15 @@ GREY_INFO_STRUCT
# define FFT_WINDOW BUTTON_PLAY
# define FFT_QUIT BUTTON_POWER
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define FFT_PREV_GRAPH BUTTON_LEFT
+#define FFT_NEXT_GRAPH BUTTON_RIGHT
+#define FFT_AMP_SCALE BUTTON_UP
+#define FFT_FREQ_SCALE BUTTON_DOWN
+#define FFT_QUIT BUTTON_BACK
+#define FFT_ORIENTATION BUTTON_POWER
+#define FFT_WINDOW BUTTON_PLAY
+
#elif !defined(HAVE_TOUCHSCREEN)
#error No keymap defined!
#endif
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 056878e7e4..dd5f809027 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -195,6 +195,17 @@
#define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_UP)
#define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL)
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define FLIPIT_LEFT BUTTON_LEFT
+#define FLIPIT_RIGHT BUTTON_RIGHT
+#define FLIPIT_UP BUTTON_UP
+#define FLIPIT_DOWN BUTTON_DOWN
+#define FLIPIT_QUIT (BUTTON_BACK|BUTTON_REPEAT)
+#define FLIPIT_SHUFFLE BUTTON_BACK
+#define FLIPIT_SOLVE (BUTTON_PLAY|BUTTON_REPEAT)
+#define FLIPIT_STEP_BY_STEP BUTTON_POWER
+#define FLIPIT_TOGGLE BUTTON_PLAY
+
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define FLIPIT_LEFT BUTTON_LEFT
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index bb47282298..01a80c5535 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -427,6 +427,19 @@
#define FRACTAL_PRECISION_DEC BUTTON_PREV
#define FRACTAL_RESET (BUTTON_POWER | BUTTON_PLAY)
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define FRACTAL_QUIT BUTTON_BACK
+#define FRACTAL_UP BUTTON_UP
+#define FRACTAL_DOWN BUTTON_DOWN
+#define FRACTAL_RIGHT BUTTON_RIGHT
+#define FRACTAL_LEFT BUTTON_LEFT
+#define FRACTAL_ZOOM_IN (BUTTON_POWER|BUTTON_UP)
+#define FRACTAL_ZOOM_OUT (BUTTON_POWER|BUTTON_DOWN)
+#define FRACTAL_PRECISION_INC (BUTTON_POWER|BUTTON_RIGHT)
+#define FRACTAL_PRECISION_DEC (BUTTON_POWER|BUTTON_LEFT)
+#define FRACTAL_RESET BUTTON_PLAY
+
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index d53c6bb5c4..b0f6dbb3d4 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -392,6 +392,14 @@
#define GBN_BUTTON_PLAY BUTTON_SELECT
#define GBN_BUTTON_MENU BUTTON_MENU
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define GBN_BUTTON_UP BUTTON_UP
+#define GBN_BUTTON_DOWN BUTTON_DOWN
+#define GBN_BUTTON_LEFT BUTTON_LEFT
+#define GBN_BUTTON_RIGHT BUTTON_RIGHT
+#define GBN_BUTTON_PLAY BUTTON_PLAY
+#define GBN_BUTTON_MENU BUTTON_BACK
+
#elif (CONFIG_KEYPAD == HM60X_PAD)
#define GBN_BUTTON_UP BUTTON_UP
#define GBN_BUTTON_DOWN BUTTON_DOWN
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 4827ffa038..7695b720d3 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -428,6 +428,18 @@
#define IMGVIEW_MENU BUTTON_SELECT
#define IMGVIEW_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define IMGVIEW_ZOOM_PRE BUTTON_POWER
+#define IMGVIEW_ZOOM_IN (BUTTON_POWER|BUTTON_REL)
+#define IMGVIEW_ZOOM_OUT (BUTTON_POWER|BUTTON_REPEAT)
+#define IMGVIEW_UP BUTTON_UP
+#define IMGVIEW_LEFT BUTTON_LEFT
+#define IMGVIEW_RIGHT BUTTON_RIGHT
+#define IMGVIEW_DOWN BUTTON_DOWN
+#define IMGVIEW_NEXT BUTTON_PLAY
+#define IMGVIEW_PREVIOUS BUTTON_BACK
+#define IMGVIEW_MENU (BUTTON_BACK|BUTTON_REPEAT)
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 158ad2f4d7..81b2df50d7 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -237,6 +237,13 @@ CONFIG_KEYPAD == MROBE500_PAD
#define RIGHT BUTTON_RIGHT
#define FIRE BUTTON_SELECT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+
+#define QUIT BUTTON_BACK
+#define LEFT BUTTON_LEFT
+#define RIGHT BUTTON_RIGHT
+#define FIRE BUTTON_PLAY
+
#elif (CONFIG_KEYPAD == HM60X_PAD) || \
(CONFIG_KEYPAD == HM801_PAD)
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 3270bd1a3d..f3fbb2e80b 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -123,6 +123,17 @@
#define HK_SELECT "SELECT"
#define HK_CANCEL "POWER"
+
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define JEWELS_UP BUTTON_UP
+#define JEWELS_DOWN BUTTON_DOWN
+#define JEWELS_LEFT BUTTON_LEFT
+#define JEWELS_RIGHT BUTTON_RIGHT
+#define JEWELS_SELECT BUTTON_PLAY
+#define JEWELS_CANCEL BUTTON_BACK
+#define HK_SELECT "PLAY"
+#define HK_CANCEL "BACK"
+
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_CONNECT_PAD)
#define JEWELS_SCROLLWHEEL
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index af76dcb13a..773cc90196 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -259,6 +259,14 @@
#define BTN_DOWN BUTTON_DOWN
#define BTN_PLAY BUTTON_SELECT
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define BTN_QUIT BUTTON_BACK
+#define BTN_RIGHT BUTTON_RIGHT
+#define BTN_LEFT BUTTON_LEFT
+#define BTN_UP BUTTON_UP
+#define BTN_DOWN BUTTON_DOWN
+#define BTN_PLAY BUTTON_PLAY
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index c1e6b4a84d..030151398a 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -357,6 +357,16 @@ CONFIG_KEYPAD == MROBE500_PAD
# define MINESWP_DISCOVER BUTTON_PLAY
# define MINESWP_INFO BUTTON_VOL_DOWN
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define MINESWP_LEFT BUTTON_LEFT
+#define MINESWP_RIGHT BUTTON_RIGHT
+#define MINESWP_UP BUTTON_UP
+#define MINESWP_DOWN BUTTON_DOWN
+#define MINESWP_QUIT BUTTON_BACK
+#define MINESWP_TOGGLE BUTTON_PLAY
+#define MINESWP_DISCOVER (BUTTON_PLAY|BUTTON_REPEAT)
+#define MINESWP_INFO BUTTON_POWER
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 642194b983..1326d4484d 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2528,6 +2528,12 @@ CONFIG_KEYPAD == MROBE500_PAD
#define MP3ENC_DONE BUTTON_DOWN
#define MP3ENC_SELECT BUTTON_SELECT
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define MP3ENC_PREV BUTTON_LEFT
+#define MP3ENC_NEXT BUTTON_RIGHT
+#define MP3ENC_DONE BUTTON_DOWN
+#define MP3ENC_SELECT BUTTON_PLAY
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 26dd24113c..a5963ef94e 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -273,6 +273,14 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_DOWN BUTTON_DOWN
#define MPEG_START_TIME_EXIT BUTTON_POWER
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define MPEG_START_TIME_SELECT BUTTON_PLAY
+#define MPEG_START_TIME_LEFT BUTTON_LEFT
+#define MPEG_START_TIME_RIGHT BUTTON_RIGHT
+#define MPEG_START_TIME_UP BUTTON_UP
+#define MPEG_START_TIME_DOWN BUTTON_DOWN
+#define MPEG_START_TIME_EXIT BUTTON_BACK
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 97fe7d3f4c..69062d5062 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -399,6 +399,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define MPEG_RW BUTTON_PREV
#define MPEG_FF BUTTON_NEXT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define MPEG_MENU BUTTON_BACK
+#define MPEG_PAUSE BUTTON_PLAY
+#define MPEG_STOP BUTTON_POWER
+#define MPEG_VOLDOWN BUTTON_LEFT
+#define MPEG_VOLUP BUTTON_RIGHT
+#define MPEG_RW BUTTON_UP
+#define MPEG_FF BUTTON_DOWN
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index e23baf01d9..66a2aad7a0 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -464,6 +464,17 @@
#define OSCILLOSCOPE_VOL_DOWN BUTTON_LEFT
/* Need GRAPHMODE */
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define OSCILLOSCOPE_QUIT (BUTTON_BACK|BUTTON_REPEAT)
+#define OSCILLOSCOPE_DRAWMODE BUTTON_BACK
+#define OSCILLOSCOPE_ADVMODE (BUTTON_POWER|BUTTON_REPEAT)
+#define OSCILLOSCOPE_ORIENTATION BUTTON_POWER
+#define OSCILLOSCOPE_PAUSE BUTTON_PLAY
+#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
+#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
+#define OSCILLOSCOPE_VOL_UP BUTTON_UP
+#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 1270e9c064..ebce692118 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -310,6 +310,15 @@
#define PACMAN_COIN BUTTON_PREV
#define PACMAN_MENU BUTTON_POWER
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define PACMAN_UP BUTTON_UP
+#define PACMAN_DOWN BUTTON_DOWN
+#define PACMAN_LEFT BUTTON_LEFT
+#define PACMAN_RIGHT BUTTON_RIGHT
+#define PACMAN_MENU BUTTON_BACK
+#define PACMAN_1UP BUTTON_POWER
+#define PACMAN_COIN BUTTON_PLAY
+
#else
#error Keymap not defined!
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 9ad816c6a1..c3a99389f5 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -594,6 +594,23 @@ CONFIG_KEYPAD == MROBE500_PAD
#define LVL_DOWN_TEXT "PREV"
#define SELECT_TEXT "SELECT"
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define PEGBOX_RIGHT BUTTON_RIGHT
+#define PEGBOX_LEFT BUTTON_LEFT
+#define PEGBOX_UP BUTTON_UP
+#define PEGBOX_DOWN BUTTON_DOWN
+#define PEGBOX_QUIT BUTTON_POWER
+#define PEGBOX_SELECT BUTTON_PLAY
+#define PEGBOX_RESTART BUTTON_BACK
+
+#define SAVE_TEXT "BACK+PLAY"
+#define QUIT_TEXT "POWER"
+#define RESTART_TEXT "BACK+POWER"
+#define LVL_UP_TEXT "BACK+RIGHT"
+#define LVL_DOWN_TEXT "BACK+LEFT"
+#define SELECT_TEXT "PLAY"
+
+
#else
#error Unsupported keymap!
#endif
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index ccf07544f2..3299ebbf3e 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -271,6 +271,14 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PONG_RIGHT_UP BUTTON_RIGHT
#define PONG_RIGHT_DOWN BUTTON_LEFT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define PONG_QUIT BUTTON_BACK
+#define PONG_PAUSE BUTTON_PLAY
+#define PONG_LEFT_UP BUTTON_UP
+#define PONG_LEFT_DOWN BUTTON_DOWN
+#define PONG_RIGHT_UP BUTTON_RIGHT
+#define PONG_RIGHT_DOWN BUTTON_LEFT
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 131a3df32a..ef54945fec 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -296,6 +296,14 @@
#elif CONFIG_KEYPAD == SAMSUNG_YPR1_PAD
#define REVERSI_BUTTON_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define REVERSI_BUTTON_UP BUTTON_UP
+#define REVERSI_BUTTON_DOWN BUTTON_DOWN
+#define REVERSI_BUTTON_LEFT BUTTON_LEFT
+#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
+#define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAY
+#define REVERSI_BUTTON_MENU BUTTON_POWER
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 762f5befc4..a531245a1c 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -429,6 +429,16 @@
#define ROCKBLOX_DROP BUTTON_SELECT
#define ROCKBLOX_RESTART BUTTON_PLAY
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define ROCKBLOX_OFF (BUTTON_BACK|BUTTON_REPEAT)
+#define ROCKBLOX_ROTATE_CCW BUTTON_POWER
+#define ROCKBLOX_ROTATE_CW BUTTON_UP
+#define ROCKBLOX_DOWN BUTTON_DOWN
+#define ROCKBLOX_LEFT BUTTON_LEFT
+#define ROCKBLOX_RIGHT BUTTON_RIGHT
+#define ROCKBLOX_DROP BUTTON_PLAY
+#define ROCKBLOX_RESTART BUTTON_BACK
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index ba70d77627..ec6a7d85f8 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -378,6 +378,19 @@ static void setoptions (void)
options.SELECT = BUTTON_SELECT;
options.MENU = BUTTON_POWER;
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+ options.UP = BUTTON_UP;
+ options.DOWN = BUTTON_DOWN;
+ options.LEFT = BUTTON_LEFT;
+ options.RIGHT = BUTTON_RIGHT;
+
+ options.START = BUTTON_PLAY;
+ options.MENU = BUTTON_BACK;
+ options.SELECT = (BUTTON_POWER|BUTTON_PLAY);
+ options.A = (BUTTON_POWER|BUTTON_LEFT);
+ options.B = (BUTTON_POWER|BUTTON_RIGHT);
+
+
#else
#error No Keymap Defined!
#endif
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index ce1b911e43..ab384e7644 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -288,6 +288,17 @@
#define ROCKPAINT_LEFT BUTTON_LEFT
#define ROCKPAINT_RIGHT BUTTON_RIGHT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define ROCKPAINT_QUIT (BUTTON_BACK|BUTTON_REPEAT)
+#define ROCKPAINT_DRAW BUTTON_PLAY
+#define ROCKPAINT_MENU BUTTON_BACK
+#define ROCKPAINT_UP BUTTON_UP
+#define ROCKPAINT_DOWN BUTTON_DOWN
+#define ROCKPAINT_LEFT BUTTON_LEFT
+#define ROCKPAINT_RIGHT BUTTON_RIGHT
+#define ROCKPAINT_TOOLBAR BUTTON_POWER
+#define ROCKPAINT_TOOLBAR2 (BUTTON_POWER|BUTTON_REPEAT)
+
#else
#error "Please define keys for this keypad"
#endif
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 53c64525ba..ad8eeb70ae 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -292,6 +292,15 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PUZZLE_SHUFFLE BUTTON_SELECT
#define PUZZLE_PICTURE BUTTON_PLAY
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define PUZZLE_QUIT BUTTON_BACK
+#define PUZZLE_LEFT BUTTON_LEFT
+#define PUZZLE_RIGHT BUTTON_RIGHT
+#define PUZZLE_UP BUTTON_UP
+#define PUZZLE_DOWN BUTTON_DOWN
+#define PUZZLE_SHUFFLE BUTTON_POWER
+#define PUZZLE_PICTURE BUTTON_PLAY
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index e662a3b2e7..eb1fb25b0d 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -253,6 +253,14 @@ 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_SELECT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define SNAKE_QUIT BUTTON_BACK
+#define SNAKE_LEFT BUTTON_LEFT
+#define SNAKE_RIGHT BUTTON_RIGHT
+#define SNAKE_UP BUTTON_UP
+#define SNAKE_DOWN BUTTON_DOWN
+#define SNAKE_PLAYPAUSE BUTTON_PLAY
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 54a2bc8709..e2f54f28c7 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -365,6 +365,16 @@ CONFIG_KEYPAD == MROBE500_PAD
#define SNAKE2_PLAYPAUSE BUTTON_SELECT
#define SNAKE2_PLAYPAUSE_TEXT "Select"
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define SNAKE2_LEFT BUTTON_LEFT
+#define SNAKE2_RIGHT BUTTON_RIGHT
+#define SNAKE2_UP BUTTON_UP
+#define SNAKE2_DOWN BUTTON_DOWN
+#define SNAKE2_QUIT BUTTON_BACK
+#define SNAKE2_PLAYPAUSE BUTTON_PLAY
+#define SNAKE2_PLAYPAUSE_TEXT "Play"
+
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index a3d760d5cd..9a7d6572cc 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -392,6 +392,18 @@
#define BUTTON_SAVE BUTTON_PLAY
#define BUTTON_SAVE_NAME "PLAY"
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define SOKOBAN_LEFT BUTTON_LEFT
+#define SOKOBAN_RIGHT BUTTON_RIGHT
+#define SOKOBAN_UP BUTTON_UP
+#define SOKOBAN_DOWN BUTTON_DOWN
+#define SOKOBAN_MENU BUTTON_POWER
+#define SOKOBAN_UNDO BUTTON_BACK
+#define SOKOBAN_REDO BUTTON_NONE
+#define SOKOBAN_PAUSE BUTTON_PLAY
+#define BUTTON_SAVE BUTTON_PLAY
+#define BUTTON_SAVE_NAME "Play"
+
#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
#define SOKOBAN_LEFT BUTTON_LEFT
#define SOKOBAN_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 0a1dc36cf5..d97ae082a7 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -617,6 +617,23 @@ CONFIG_KEYPAD == MROBE500_PAD
# define HK_CUR2STACK "POWER + LEFT"
# define HK_REM2STACK "POWER + RIGHT"
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define SOL_QUIT BUTTON_BACK
+#define SOL_UP BUTTON_UP
+#define SOL_DOWN BUTTON_DOWN
+#define SOL_LEFT BUTTON_LEFT
+#define SOL_RIGHT BUTTON_RIGHT
+#define SOL_MOVE BUTTON_PLAY
+#define SOL_DRAW (BUTTON_POWER|BUTTON_UP)
+#define SOL_REM2CUR (BUTTON_POWER|BUTTON_DOWN)
+#define SOL_CUR2STACK (BUTTON_POWER|BUTTON_LEFT)
+#define SOL_REM2STACK (BUTTON_POWER|BUTTON_RIGHT)
+#define HK_MOVE "Play"
+#define HK_DRAW "Option+Up"
+#define HK_REM2CUR "Option+Down"
+#define HK_CUR2STACK "Option+Left"
+#define HK_REM2STACK "Option+Right"
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index bc67e4d6d6..5f40589be8 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -315,6 +315,15 @@
#define AST_RIGHT BUTTON_RIGHT
#define AST_FIRE BUTTON_SELECT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define AST_PAUSE BUTTON_POWER
+#define AST_QUIT BUTTON_BACK
+#define AST_THRUST BUTTON_UP
+#define AST_HYPERSPACE BUTTON_DOWN
+#define AST_LEFT BUTTON_LEFT
+#define AST_RIGHT BUTTON_RIGHT
+#define AST_FIRE BUTTON_PLAY
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index d74fc45e89..a7ef116d15 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -549,6 +549,22 @@
#define STAR_LEVEL_DOWN_NAME "PREV"
#define STAR_LEVEL_REPEAT_NAME "PLAY"
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define STAR_QUIT BUTTON_BACK
+#define STAR_LEFT BUTTON_LEFT
+#define STAR_RIGHT BUTTON_RIGHT
+#define STAR_UP BUTTON_UP
+#define STAR_DOWN BUTTON_DOWN
+#define STAR_TOGGLE_CONTROL BUTTON_PLAY
+#define STAR_LEVEL_UP (BUTTON_POWER|BUTTON_UP)
+#define STAR_LEVEL_DOWN (BUTTON_POWER|BUTTON_DOWN)
+#define STAR_LEVEL_REPEAT (BUTTON_POWER|BUTTON_PLAY)
+#define STAR_LEVEL_UP_NAME "Option+Up"
+#define STAR_LEVEL_DOWN_NAME "Option+Down"
+#define STAR_LEVEL_REPEAT_NAME "Option+Play"
+#define STAR_TOGGLE_CONTROL_NAME "Play"
+#define STAR_QUIT_NAME "Back"
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index e83fd5d42d..bc0aca8ff5 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -289,6 +289,14 @@
#define STOPWATCH_SCROLL_UP BUTTON_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define STOPWATCH_QUIT BUTTON_POWER
+#define STOPWATCH_START_STOP BUTTON_PLAY
+#define STOPWATCH_RESET_TIMER BUTTON_BACK
+#define STOPWATCH_LAP_TIMER BUTTON_RIGHT
+#define STOPWATCH_SCROLL_UP BUTTON_UP
+#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index dc29594223..ba476b4b55 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -380,6 +380,16 @@
#define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT)
#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT
+
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define SUDOKU_BUTTON_MENU BUTTON_BACK
+#define SUDOKU_BUTTON_UP BUTTON_UP
+#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
+#define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY
+#define SUDOKU_BUTTON_POSSIBLE BUTTON_POWER
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c
index 5e1479cd3b..1f62b3cde7 100644
--- a/apps/plugins/superdom.c
+++ b/apps/plugins/superdom.c
@@ -198,6 +198,14 @@ char buf[255];
#define SUPERDOM_RIGHT BUTTON_RIGHT
#define SUPERDOM_CANCEL BUTTON_BACK
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define SUPERDOM_OK BUTTON_PLAY
+#define SUPERDOM_UP BUTTON_UP
+#define SUPERDOM_DOWN BUTTON_DOWN
+#define SUPERDOM_LEFT BUTTON_LEFT
+#define SUPERDOM_RIGHT BUTTON_RIGHT
+#define SUPERDOM_CANCEL BUTTON_BACK
+
#elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
#define SUPERDOM_OK BUTTON_SELECT
#define SUPERDOM_UP BUTTON_UP
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index b63f8780ea..b1660c0840 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -486,6 +486,16 @@
#define TV_AUTOSCROLL BUTTON_NEXT
#define TV_BOOKMARK BUTTON_SELECT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define TV_QUIT (BUTTON_BACK|BUTTON_REPEAT)
+#define TV_SCROLL_UP BUTTON_UP
+#define TV_SCROLL_DOWN BUTTON_DOWN
+#define TV_SCREEN_LEFT BUTTON_LEFT
+#define TV_SCREEN_RIGHT BUTTON_RIGHT
+#define TV_MENU BUTTON_BACK
+#define TV_AUTOSCROLL BUTTON_PLAY
+#define TV_BOOKMARK BUTTON_POWER
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 06fc137754..5fd5003085 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -373,6 +373,17 @@
#define LABEL_MENU "LEFT"
#define LABEL_VOLUME "UP/DOWN"
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define VUMETER_QUIT BUTTON_BACK
+#define VUMETER_HELP BUTTON_RIGHT
+#define VUMETER_MENU BUTTON_LEFT
+#define VUMETER_UP BUTTON_UP
+#define VUMETER_DOWN BUTTON_DOWN
+#define LABEL_HELP "Right"
+#define LABEL_QUIT "Back"
+#define LABEL_MENU "Left"
+#define LABEL_VOLUME "Up/Down"
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 8f4c7ab5ac..d7cb6fbba2 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -352,6 +352,15 @@ CONFIG_KEYPAD == MROBE500_PAD
#define BTN_QUIT BUTTON_POWER
#define BTN_STOPRESET BUTTON_PLAY
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define BTN_DIR_UP BUTTON_UP
+#define BTN_DIR_DOWN BUTTON_DOWN
+#define BTN_DIR_LEFT BUTTON_LEFT
+#define BTN_DIR_RIGHT BUTTON_RIGHT
+#define BTN_STARTPAUSE BUTTON_PLAY
+#define BTN_QUIT BUTTON_BACK
+#define BTN_STOPRESET BUTTON_POWER
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 7b2189762e..8c6988e0f9 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -306,6 +306,14 @@ CONFIG_KEYPAD == MROBE500_PAD
#define DOWN BUTTON_DOWN
#define PAUSE BUTTON_SELECT
+#elif CONFIG_KEYPAD == SONY_NWZ_PAD
+#define QUIT BUTTON_BACK
+#define LEFT BUTTON_LEFT
+#define RIGHT BUTTON_RIGHT
+#define UP BUTTON_UP
+#define DOWN BUTTON_DOWN
+#define PAUSE BUTTON_PLAY
+
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index 659bcca40a..b14a296d42 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -246,6 +246,14 @@
#define ZX_LEFT BUTTON_LEFT
#define ZX_RIGHT BUTTON_RIGHT
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define ZX_MENU BUTTON_POWER
+#define ZX_UP BUTTON_UP
+#define ZX_DOWN BUTTON_DOWN
+#define ZX_LEFT BUTTON_LEFT
+#define ZX_RIGHT BUTTON_RIGHT
+#define ZX_SELECT BUTTON_PLAY
+
#else
#error Keymap not defined!
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index 62f593df37..b4b39d57da 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -254,6 +254,14 @@
#define KBD_UP BUTTON_UP
#define KBD_DOWN BUTTON_DOWN
+#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
+#define KBD_SELECT BUTTON_PLAY
+#define KBD_ABORT BUTTON_BACK
+#define KBD_LEFT BUTTON_LEFT
+#define KBD_RIGHT BUTTON_RIGHT
+#define KBD_UP BUTTON_UP
+#define KBD_DOWN BUTTON_DOWN
+
#endif
#ifdef HAVE_TOUCHSCREEN
diff --git a/tools/configure b/tools/configure
index cfc9aa5767..4cfd29404f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3669,7 +3669,7 @@ fi
output="rockbox.sony"
bootoutput="bootloader-nwze370.sony"
appextra="gui:recorder:radio"
- plugins=""
+ plugins="yes"
swcodec="yes"
toolset=$scramblebitmaptools
t_cpu="arm"
@@ -3689,7 +3689,7 @@ fi
output="rockbox.sony"
bootoutput="bootloader-nwze360.sony"
appextra="gui:recorder:radio"
- plugins=""
+ plugins="yes"
swcodec="yes"
toolset=$scramblebitmaptools
t_cpu="arm"