summaryrefslogtreecommitdiff
path: root/apps/keymaps
diff options
context:
space:
mode:
authorDavid Jilke <jilke.david@hotmail.com>2014-03-21 22:16:02 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2014-04-06 20:51:12 +0200
commitd489444119f6c734d7065cd52833f37fd7f739e8 (patch)
tree64d593a75976116713f4dbb8e68e7e394d3ff767 /apps/keymaps
parent8375b691e629bfbfb2a6ea213c35fe645085d9b7 (diff)
downloadrockbox-d489444119f6c734d7065cd52833f37fd7f739e8.tar.gz
rockbox-d489444119f6c734d7065cd52833f37fd7f739e8.zip
Complete Plugin Keymaps for Creative Zen X-Fi3
This patch completes the plugin keymaps for the Zen X-Fi3 and enables those plugins for compilation. One key was changed in "button-target.h" for compatibility with Rockboy. This also caused the changes to "keymap-zenxfi3.c", to keep the stock functionality (no further changes in here). Change-Id: Ic222faf89e9a9a2332a49d6e532cedb6eb16d3d7 Reviewed-on: http://gerrit.rockbox.org/762 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'apps/keymaps')
-rw-r--r--apps/keymaps/keymap-zenxfi3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c
index 1a9be54a06..aa68a34f43 100644
--- a/apps/keymaps/keymap-zenxfi3.c
+++ b/apps/keymaps/keymap-zenxfi3.c
@@ -47,7 +47,7 @@ static const struct button_mapping button_context_standard[] = {
47 47
48 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 48 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
49 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 49 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
50 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 50 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
51 51
52 { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, 52 { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
53 53
@@ -79,8 +79,8 @@ static const struct button_mapping button_context_wps[] = {
79static const struct button_mapping button_context_keyboard[] = { 79static const struct button_mapping button_context_keyboard[] = {
80 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 80 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
81 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 81 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
82 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 82 { ACTION_KBD_RIGHT, BUTTON_PLAY, BUTTON_NONE },
83 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 83 { ACTION_KBD_RIGHT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
84 { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, 84 { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE },
85 { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 85 { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
86 { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, 86 { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE },
@@ -102,7 +102,7 @@ static const struct button_mapping button_context_quickscreen[] = {
102 { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, 102 { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
103 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, 103 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
104 { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, 104 { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
105 { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 105 { ACTION_QS_RIGHT, BUTTON_PLAY, BUTTON_NONE },
106 106
107 LAST_ITEM_IN_LIST 107 LAST_ITEM_IN_LIST
108}; /* button_context_quickscreen */ 108}; /* button_context_quickscreen */
@@ -149,7 +149,7 @@ static const struct button_mapping button_context_recscreen[] = {
149 149
150static const struct button_mapping button_context_settings[] = { 150static const struct button_mapping button_context_settings[] = {
151 /* we overwrite this to avoid select from std */ 151 /* we overwrite this to avoid select from std */
152 { ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 152 { ACTION_NONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
153 153
154 { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, 154 { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
155 { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 155 { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },