diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2012-05-19 16:09:46 +0200 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2012-05-19 16:10:52 +0200 |
| commit | 12c64a4b79e043d8e8d77a278b340310f867a588 (patch) | |
| tree | b34b56131d6eb0e06340a8a6d7e32843027d0f59 /apps/plugins | |
| parent | e09c1e3d43665d04ae0ce2f288ba695b5abc3622 (diff) | |
| download | rockbox-12c64a4b79e043d8e8d77a278b340310f867a588.zip rockbox-12c64a4b79e043d8e8d77a278b340310f867a588.tar.gz rockbox-12c64a4b79e043d8e8d77a278b340310f867a588.tar.bz2 rockbox-12c64a4b79e043d8e8d77a278b340310f867a588.tar.xz | |
Initial commit for the Creative ZEN X-Fi2 and X-Fi3 ports
These are really similar devices so one commit for both is ok.
Change-Id: I8bd1d3fef1eb6d00aaadfb7af56c771f62d0c9c3
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/battery_bench.c | 6 | ||||
| -rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index cd863fa..8a5ff2f 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -240,10 +240,16 @@ #define BATTERY_ON_TXT "SELECT - start" #define BATTERY_OFF_TXT "POWER" +#elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD +#define BATTERY_ON BUTTON_PLAY +#define BATTERY_OFF BUTTON_POWER +#define BATTERY_ON_TXT "PLAY - start" + #elif (CONFIG_KEYPAD == HM60X_PAD) || (CONFIG_KEYPAD == HM801_PAD) #define BATTERY_ON BUTTON_SELECT #define BATTERY_OFF BUTTON_POWER #define BATTERY_ON_TXT "SELECT - start" + #define BATTERY_OFF_TXT "POWER" #else diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 9505668..b351955 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -118,6 +118,7 @@ const struct button_mapping pla_main_ctx[] = || (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \ || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \ || (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \ + || (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) \ || (CONFIG_KEYPAD == HM60X_PAD) \ || (CONFIG_KEYPAD == HM801_PAD)) { PLA_UP, BUTTON_UP, BUTTON_NONE }, @@ -417,6 +418,12 @@ const struct button_mapping pla_main_ctx[] = {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, +#elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) + {PLA_CANCEL, BUTTON_VOL_DOWN, BUTTON_NONE}, + {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, + {PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE}, + {PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP}, + {PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, #else # ifndef HAVE_TOUCHSCREEN # error pluginlib_actions: No actions defined |