summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2009-12-12 05:37:55 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2009-12-12 05:37:55 +0000
commitd194ddf1ca3fdd4a7d845ac92e0a2c8ad84a3957 (patch)
treefe9a992509e221ac43457b9e37152033e385da7e
parent6db14703937fc157f0ac87a5b6b2b3e59d411772 (diff)
downloadrockbox-d194ddf1ca3fdd4a7d845ac92e0a2c8ad84a3957.tar.gz
rockbox-d194ddf1ca3fdd4a7d845ac92e0a2c8ad84a3957.zip
Cowon D2: Revert some of r23927 (keymap changes), and restore Radio keymappings
to previous state git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23936 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-cowond2.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index 594a68f4a4..8067fe47d0 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -72,6 +72,7 @@ static const struct button_mapping button_context_list[] = {
72 72
73static const struct button_mapping button_context_tree[] = { 73static const struct button_mapping button_context_tree[] = {
74 { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS }, 74 { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS },
75 { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS|BUTTON_REPEAT },
75 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 76 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
76 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) 77 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
77}; /* button_context_tree */ 78}; /* button_context_tree */
@@ -151,12 +152,8 @@ static const struct button_mapping button_context_keyboard[] = {
151}; /* button_context_keyboard */ 152}; /* button_context_keyboard */
152 153
153static const struct button_mapping button_context_radio[] = { 154static const struct button_mapping button_context_radio[] = {
154 { ACTION_STD_PREV, BUTTON_MINUS, BUTTON_NONE }, 155 { ACTION_FM_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
155 { ACTION_STD_PREVREPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE }, 156 { ACTION_FM_PRESET, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
156 { ACTION_STD_NEXT, BUTTON_PLUS, BUTTON_NONE },
157 { ACTION_STD_NEXTREPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE },
158 { ACTION_FM_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
159 { ACTION_FM_PRESET, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
160 { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE }, 157 { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE },
161 158
162 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) 159 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)