Zen XFi2: Enable Plugins

Keymaps aren't tested, there may be room for improvement.


Change-Id: I6b8fe697899b241ea6e96f4fe446d88671ad7818

apps/plugins/battery_bench.c

@@ -267,6 +267,12 @@
 #define BATTERY_OFF_TXT "Power Long"
 #define BATTERY_ON_TXT  "Play - start"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define BATTERY_ON      BUTTON_MENU
+#define BATTERY_OFF     BUTTON_POWER
+#define BATTERY_OFF_TXT "Power"
+#define BATTERY_ON_TXT  "Menu - start"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/blackjack.c

@@ -555,6 +555,10 @@ enum {
 #define BJACK_QUIT_NAME     "Power"
 #define BJACK_DOUBLE_NAME   "Right"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define BJACK_QUIT          BUTTON_POWER
+#define BJACK_QUIT_NAME     "Power"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/brickmania.c

@@ -319,6 +319,11 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define UP        BUTTON_VOL_UP
 #define DOWN      BUTTON_VOL_DOWN
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define QUIT      BUTTON_POWER
+#define SELECT    BUTTON_MENU
+#define CONTINUE_TEXT "Press MENU To Continue"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/calculator.c

@@ -511,6 +511,10 @@ F3: equal to "="
 #elif CONFIG_KEYPAD == DX50_PAD
 #define CALCULATOR_QUIT    BUTTON_POWER
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CALCULATOR_QUIT     BUTTON_POWER
+#define CALCULATOR_INPUT    BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/calendar.c

@@ -398,6 +398,11 @@
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
 #define CALENDAR_EVENT_MENU_NAME "play"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CALENDAR_QUIT       BUTTON_POWER
+#define CALENDAR_SELECT     BUTTON_MENU
+#define CALENDAR_EVENT_MENU_NAME "menu"
+
 #else
 #error "No keypad setting."
 #endif

apps/plugins/chessbox/chessbox_pgn.h

@@ -541,6 +541,9 @@
 #define CB_SCROLL_LEFT   (BUTTON_LEFT|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_RIGHT|BUTTON_REPEAT)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CB_MENU    BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/chessclock.c

@@ -398,6 +398,10 @@
 #define CHC_SETTINGS_DEC    BUTTON_VOL_DOWN
 #define CHC_SETTINGS_CANCEL BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CHC_QUIT            BUTTON_POWER
+#define CHC_STARTSTOP       BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif
@@ -406,6 +410,9 @@
 #ifndef CHC_SETTINGS_OK
 #define CHC_SETTINGS_OK  BUTTON_CENTER
 #endif
+#ifndef CHC_SETTINGS_CANCEL
+#define CHC_SETTINGS_CANCEL BUTTON_TOPLEFT
+#endif
 #ifndef CHC_STARTSTOP
 #define CHC_STARTSTOP    BUTTON_CENTER
 #endif

apps/plugins/chip8.c

@@ -1263,6 +1263,18 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif (CONFIG_KEYPAD == DX50_PAD)
 #define CHIP8_OFF  BUTTON_POWER
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CHIP8_OFF   BUTTON_POWER
+#define CHIP8_KEY1  BUTTON_TOPLEFT
+#define CHIP8_KEY2  BUTTON_TOPMIDDLE
+#define CHIP8_KEY3  BUTTON_TOPRIGHT
+#define CHIP8_KEY4  BUTTON_MIDLEFT
+#define CHIP8_KEY5  BUTTON_CENTER
+#define CHIP8_KEY6  BUTTON_MIDRIGHT
+#define CHIP8_KEY7  BUTTON_BOTTOMLEFT
+#define CHIP8_KEY8  BUTTON_BOTTOMMIDDLE
+#define CHIP8_KEY9  BUTTON_BOTTOMRIGHT
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/clix.c

@@ -256,6 +256,16 @@
 #elif (CONFIG_KEYPAD == DX50_PAD)
 #define CLIX_BUTTON_QUIT          BUTTON_POWER
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CLIX_BUTTON_QUIT          BUTTON_POWER
+#define CLIX_BUTTON_UP            BUTTON_TOPMIDDLE
+#define CLIX_BUTTON_DOWN          BUTTON_BOTTOMMIDDLE
+#define CLIX_BUTTON_SCROLL_FWD    BUTTON_TOPRIGHT
+#define CLIX_BUTTON_SCROLL_BACK   BUTTON_TOPLEFT
+#define CLIX_BUTTON_LEFT          BUTTON_MIDLEFT
+#define CLIX_BUTTON_RIGHT         BUTTON_MIDRIGHT
+#define CLIX_BUTTON_CLICK         BUTTON_CENTER
+
 #else
 #error "no keymap"
 #endif

apps/plugins/cube.c

@@ -400,6 +400,9 @@
 #define CUBE_DEC           BUTTON_VOL_DOWN
 #define CUBE_MODE          BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define CUBE_QUIT       BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/doom/i_video.c

@@ -538,6 +538,11 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_WEAPON     BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP        BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define DOOMBUTTON_ESC      BUTTON_POWER
+#define DOOMBUTTON_SHOOT    BUTTON_MENU
+#define DOOMBUTTON_MAP      BUTTON_TOPLEFT
+
 #else
 #error Keymap not defined!
 #endif

apps/plugins/flipit.c

@@ -465,6 +465,11 @@
 #define FLIPIT_STEP_BY_STEP (BUTTON_LEFT|BUTTON_POWER)
 #define FLIPIT_TOGGLE       BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+
+#define FLIPIT_QUIT         BUTTON_POWER
+#define FLIPIT_TOGGLE       BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/fractals/fractal.h

@@ -469,6 +469,9 @@
 #elif CONFIG_KEYPAD == DX50_PAD
 #define FRACTAL_QUIT            (BUTTON_POWER|BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define FRACTAL_QUIT            BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/imageviewer/imageviewer_button.h

@@ -479,6 +479,10 @@
 #define IMGVIEW_QUIT        (BUTTON_POWER|BUTTON_REL)
 #define IMGVIEW_MENU        (BUTTON_PLAY|BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define IMGVIEW_QUIT        BUTTON_POWER
+#define IMGVIEW_MENU        BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/invadrox.c

@@ -267,6 +267,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define RIGHT BUTTON_PLAY
 #define FIRE  BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+
+#define QUIT  BUTTON_POWER
+#define FIRE  BUTTON_MENU
+
 #else
     #error INVADROX: Unsupported keypad
 #endif

apps/plugins/jewels.c

@@ -363,6 +363,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define JEWELS_CANCEL BUTTON_POWER
 #define HK_CANCEL "Power"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define JEWELS_CANCEL BUTTON_POWER
+#define HK_CANCEL "Power"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/lib/keymaps.h

@@ -42,7 +42,6 @@
 #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)  || \
     (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)  || \
     (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)   || \
-    (CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
     (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
     (CONFIG_KEYPAD == SANSA_CONNECT_PAD)    || \
     (CONFIG_KEYPAD == SANSA_C200_PAD)       || \
@@ -91,7 +90,6 @@
 #endif
 
 #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)  || \
-    (CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
     (CONFIG_KEYPAD == SANSA_CONNECT_PAD)    || \
     (CONFIG_KEYPAD == SANSA_C200_PAD)       || \
     (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)   || \
@@ -208,6 +206,10 @@
 #define BTN_FIRE       BUTTON_BOTTOMLEFT
 #define BTN_PAUSE      BUTTON_TOPLEFT
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define BTN_FIRE       BUTTON_MENU
+#define BTN_PAUSE      BUTTON_POWER
+
 #else
 #error Unsupported keypad
 #endif
@@ -224,7 +226,8 @@
 
 #elif (CONFIG_KEYPAD != COWON_D2_PAD) && \
       (CONFIG_KEYPAD != DX50_PAD)     && \
-      (CONFIG_KEYPAD != ONDAVX777_PAD)
+      (CONFIG_KEYPAD != ONDAVX777_PAD) && \
+      (CONFIG_KEYPAD != CREATIVE_ZENXFI2_PAD)
 #define BTN_FIRE       BUTTON_BOTTOMLEFT
 #define BTN_PAUSE      BUTTON_TOPLEFT
 #endif

apps/plugins/midi/midiplay.c

@@ -282,6 +282,9 @@
 #define MIDI_VOL_UP     BUTTON_VOL_UP
 #define MIDI_VOL_DOWN   BUTTON_VOL_DOWN
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define MIDI_QUIT       BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/minesweeper.c

@@ -391,6 +391,9 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif (CONFIG_KEYPAD == DX50_PAD)
 #   define MINESWP_QUIT     (BUTTON_POWER|BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#   define MINESWP_QUIT     BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/mp3_encoder.c

@@ -2546,6 +2546,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define MP3ENC_DONE    BUTTON_POWER
 #define MP3ENC_SELECT  BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define MP3ENC_DONE    BUTTON_POWER
+#define MP3ENC_SELECT  BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/mpegplayer/mpeg_settings.c

@@ -295,6 +295,9 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_UP          BUTTON_VOL_UP
 #define MPEG_START_TIME_DOWN        BUTTON_VOL_DOWN
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define MPEG_START_TIME_EXIT        BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/mpegplayer/mpegplayer.c

@@ -427,6 +427,11 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_PAUSE      BUTTON_PLAY
 #define MPEG_STOP       (BUTTON_PLAY|BUTTON_REPEAT)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define MPEG_MENU       BUTTON_POWER
+#define MPEG_PAUSE      BUTTON_MENU
+#define MPEG_STOP       (BUTTON_MENU|BUTTON_REPEAT)
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/oscilloscope.c

@@ -504,6 +504,12 @@
 #define OSCILLOSCOPE_VOL_UP          BUTTON_VOL_UP
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_VOL_DOWN
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define OSCILLOSCOPE_QUIT           BUTTON_POWER
+#define OSCILLOSCOPE_PAUSE          BUTTON_MENU
+#define OSCILLOSCOPE_ORIENTATION    BUTTON_TOPLEFT
+#define OSCILLOSCOPE_GRAPHMODE      BUTTON_BOTTOMLEFT
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/pacbox/pacbox.h

@@ -351,6 +351,9 @@
 #elif CONFIG_KEYPAD == DX50_PAD
 #define PACMAN_MENU     BUTTON_POWER
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define PACMAN_MENU     BUTTON_MENU
+
 #else
 
 #error Keymap not defined!

apps/plugins/pegbox.c

@@ -621,6 +621,13 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #define QUIT_TEXT         "Power"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define PEGBOX_QUIT     BUTTON_POWER
+#define PEGBOX_SELECT   BUTTON_MENU
+
+#define QUIT_TEXT       "POWER"
+#define SELECT_TEXT     "MENU"
+
 #else
 #error Unsupported keymap!
 #endif

apps/plugins/pong.c

@@ -297,6 +297,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif (CONFIG_KEYPAD == DX50_PAD)
 #define PONG_QUIT (BUTTON_POWER|BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define PONG_QUIT        BUTTON_POWER
+#define PONG_PAUSE       BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/reversi/reversi-gui.h

@@ -316,6 +316,10 @@
 #define REVERSI_BUTTON_QUIT         BUTTON_POWER
 #define REVERSI_BUTTON_MENU         BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define REVERSI_BUTTON_QUIT         BUTTON_POWER
+#define REVERSI_BUTTON_MENU         BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/rockblox.c

@@ -466,6 +466,10 @@
 #define ROCKBLOX_DROP          BUTTON_VOL_DOWN
 #define ROCKBLOX_RESTART       BUTTON_VOL_UP
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define ROCKBLOX_OFF           BUTTON_POWER
+#define ROCKBLOX_ROTATE        BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/rockboy/rockboy.c

@@ -408,6 +408,9 @@ static void setoptions (void)
         options.START   = BUTTON_LEFT;
         options.SELECT  = BUTTON_RIGHT;
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+        options.MENU    = BUTTON_POWER;
+
 #else
 #error No Keymap Defined!
 #endif

apps/plugins/rockpaint.c

@@ -323,6 +323,10 @@
 #elif ( CONFIG_KEYPAD == DX50_PAD )
 #define ROCKPAINT_QUIT      (BUTTON_POWER|BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define ROCKPAINT_QUIT        BUTTON_POWER
+#define ROCKPAINT_MENU        BUTTON_MENU
+
 #else
 #error "Please define keys for this keypad"
 #endif

apps/plugins/sliding_puzzle.c

@@ -316,6 +316,12 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PUZZLE_PICTURE BUTTON_RIGHT
 #define PUZZLE_QUIT_TEXT "[Power]"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define PUZZLE_QUIT    BUTTON_POWER
+#define PUZZLE_SHUFFLE BUTTON_MENU
+#define PUZZLE_QUIT_TEXT    "[POWER]"
+#define PUZZLE_SHUFFLE_TEXT "[MENU]"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/snake.c

@@ -277,6 +277,10 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_DOWN      BUTTON_VOL_DOWN
 #define SNAKE_PLAYPAUSE BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define SNAKE_QUIT      BUTTON_POWER
+#define SNAKE_PLAYPAUSE BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/snake2.c

@@ -405,6 +405,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_PLAYPAUSE    BUTTON_RIGHT
 #define SNAKE2_PLAYPAUSE_TEXT    "Right"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define SNAKE2_QUIT         BUTTON_POWER
+#define SNAKE2_PLAYPAUSE    BUTTON_MENU
+#define SNAKE2_PLAYPAUSE_TEXT "Menu"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/sokoban.c

@@ -635,6 +635,10 @@
 #define SOKOBAN_MENU_NAME "Power"
 #define SOKOBAN_PAUSE_NAME "Play"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define SOKOBAN_MENU    BUTTON_MENU
+#define SOKOBAN_MENU_NAME     "[MENU]"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/solitaire.c

@@ -667,6 +667,9 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif (CONFIG_KEYPAD == DX50_PAD)
 #   define SOL_QUIT          (BUTTON_POWER | BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#   define SOL_QUIT         BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/spacerocks.c

@@ -343,6 +343,9 @@
 #define AST_RIGHT       BUTTON_PLAY
 #define AST_FIRE        BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define AST_QUIT        BUTTON_POWER
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/star.c

@@ -601,6 +601,12 @@
 #define STAR_QUIT           BUTTON_POWER
 #define STAR_QUIT_NAME      "Power"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define STAR_QUIT               BUTTON_POWER
+#define STAR_QUIT_NAME          "POWER"
+#define STAR_TOGGLE_CONTROL     BUTTON_MENU
+#define STAR_TOGGLE_CONTROL_NAME "MENU"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/sudoku/sudoku.h

@@ -410,6 +410,10 @@
 #elif CONFIG_KEYPAD == DX50_PAD
 #define SUDOKU_BUTTON_QUIT       (BUTTON_POWER|BUTTON_REL)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define SUDOKU_BUTTON_QUIT      BUTTON_POWER
+#define SUDOKU_BUTTON_MENU      BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/test_touchscreen.c

@@ -34,6 +34,9 @@
 #elif (CONFIG_KEYPAD == ONDAVX777_PAD)
 #define TOUCHSCREEN_QUIT   BUTTON_POWER
 #define TOUCHSCREEN_TOGGLE BUTTON_MENU
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define TOUCHSCREEN_QUIT   BUTTON_POWER
+#define TOUCHSCREEN_TOGGLE BUTTON_MENU
 #elif (CONFIG_KEYPAD == ANDROID_PAD)
 #define TOUCHSCREEN_QUIT   BUTTON_BACK
 #define TOUCHSCREEN_TOGGLE BUTTON_MENU

apps/plugins/text_viewer/tv_button.h

@@ -535,6 +535,11 @@
 #define TV_AUTOSCROLL   (BUTTON_POWER | BUTTON_PLAY)
 #define TV_BOOKMARK     (BUTTON_POWER | BUTTON_VOL_UP)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define TV_QUIT         BUTTON_POWER
+#define TV_MENU         BUTTON_MENU
+#define TV_BOOKMARK     BUTTON_BOTTOMLEFT
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/vu_meter.c

@@ -403,6 +403,12 @@
 #define LABEL_QUIT      "Power"
 #define LABEL_MENU      "Play"
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define VUMETER_QUIT    BUTTON_POWER
+#define VUMETER_MENU    BUTTON_MENU
+#define LABEL_QUIT      "Power"
+#define LABEL_MENU      "Menu"
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/wormlet.c

@@ -379,6 +379,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT          BUTTON_POWER
 #define BTN_STOPRESET     (BUTTON_PLAY|BUTTON_REPEAT)
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define BTN_QUIT          BUTTON_POWER
+#define BTN_STARTPAUSE    BUTTON_MENU
+#define BTN_STOPRESET     (BUTTON_MENU|BUTTON_REPEAT)
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/xobox.c

@@ -330,6 +330,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define DOWN     BUTTON_VOL_DOWN
 #define PAUSE    BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define QUIT     BUTTON_POWER
+#define PAUSE    BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif

apps/plugins/zxbox/keymaps.h

@@ -271,6 +271,9 @@
 #define ZX_LEFT         BUTTON_LEFT
 #define ZX_RIGHT        BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
+#define ZX_MENU         BUTTON_MENU
+
 #else
 #error Keymap not defined!
 

firmware/target/arm/imx233/creative-zenxfi2/button-target.h

@@ -24,8 +24,6 @@
 #include <stdbool.h>
 #include "config.h"
 
-void button_init_device(void);
-int button_read_device(int *data);
 bool button_debug_screen(void);
 
 /* Main unit's buttons */

tools/configure

@@ -2453,7 +2453,7 @@ fi
     output="rockbox.creative"
     bootoutput="bootloader-zenxfi2.creative"
     appextra="gui:recorder:radio"
-    plugins=""
+    plugins="yes"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"