summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-12-12 07:55:17 +0000
committerJens Arnold <amiconn@rockbox.org>2006-12-12 07:55:17 +0000
commita0f311355cef06c593ed4f0c93a93f256c7eeff0 (patch)
treefcada56f9f99c2cb8a8b1ba35b228b81a00de67a
parentf51df0de210476d0fbd90a9f0e1fcd9054f275f5 (diff)
downloadrockbox-a0f311355cef06c593ed4f0c93a93f256c7eeff0.tar.gz
rockbox-a0f311355cef06c593ed4f0c93a93f256c7eeff0.zip
Action code: Made all private functions & variables static. Better module separation, and it saves a bit of binary size. * Added a few missing 'const's.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11730 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--apps/action.c20
-rw-r--r--apps/keymaps/keymap-e200.c26
-rw-r--r--apps/keymaps/keymap-gigabeat.c32
-rw-r--r--apps/keymaps/keymap-h10.c42
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c104
-rw-r--r--apps/keymaps/keymap-ifp7xx.c18
-rw-r--r--apps/keymaps/keymap-ipod.c20
-rw-r--r--apps/keymaps/keymap-newtarget.c4
-rw-r--r--apps/keymaps/keymap-ondio.c24
-rw-r--r--apps/keymaps/keymap-player.c2
-rw-r--r--apps/keymaps/keymap-recorder.c8
-rw-r--r--apps/keymaps/keymap-x5.c44
12 files changed, 173 insertions, 171 deletions
diff --git a/apps/action.c b/apps/action.c
index 07d3cb25a2..30eccb8d81 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -29,22 +29,22 @@
29#include "debug.h" 29#include "debug.h"
30#include "splash.h" 30#include "splash.h"
31 31
32bool ignore_until_release = false; 32static bool ignore_until_release = false;
33int last_button = BUTTON_NONE; 33static int last_button = BUTTON_NONE;
34 34
35/* software keylock stuff */ 35/* software keylock stuff */
36#ifndef HAS_BUTTON_HOLD 36#ifndef HAS_BUTTON_HOLD
37bool keys_locked = false; 37static bool keys_locked = false;
38int unlock_combo = BUTTON_NONE; 38static int unlock_combo = BUTTON_NONE;
39bool screen_has_lock = false; 39static bool screen_has_lock = false;
40#endif /* HAVE_SOFTWARE_KEYLOCK */ 40#endif /* HAVE_SOFTWARE_KEYLOCK */
41 41
42/* 42/*
43 * do_button_check is the worker function for get_default_action. 43 * do_button_check is the worker function for get_default_action.
44 * returns ACTION_UNKNOWN or the requested return value from the list. 44 * returns ACTION_UNKNOWN or the requested return value from the list.
45 */ 45 */
46inline int do_button_check(const struct button_mapping *items, 46static inline int do_button_check(const struct button_mapping *items,
47 int button, int last_button, int *start) 47 int button, int last_button, int *start)
48{ 48{
49 int i = 0; 49 int i = 0;
50 int ret = ACTION_UNKNOWN; 50 int ret = ACTION_UNKNOWN;
@@ -68,7 +68,7 @@ inline int do_button_check(const struct button_mapping *items,
68 return ret; 68 return ret;
69} 69}
70 70
71inline int get_next_context(const struct button_mapping *items, int i) 71static inline int get_next_context(const struct button_mapping *items, int i)
72{ 72{
73 while (items[i].button_code != BUTTON_NONE) 73 while (items[i].button_code != BUTTON_NONE)
74 i++; 74 i++;
@@ -92,8 +92,8 @@ inline int get_next_context(const struct button_mapping *items, int i)
92Any number >0 to wait that many ticks for a press 92Any number >0 to wait that many ticks for a press
93 93
94 */ 94 */
95int get_action_worker(int context, int timeout, 95static int get_action_worker(int context, int timeout,
96 const struct button_mapping* (*get_context_map)(int) ) 96 const struct button_mapping* (*get_context_map)(int) )
97{ 97{
98 const struct button_mapping *items = NULL; 98 const struct button_mapping *items = NULL;
99 int button; 99 int button;
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index a1e4b82384..f738abd9a0 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -30,7 +30,7 @@
30 * if there's no need to check the previous button's value, use BUTTON_NONE 30 * if there's no need to check the previous button's value, use BUTTON_NONE
31 * Insert LAST_ITEM_IN_LIST at the end of each mapping 31 * Insert LAST_ITEM_IN_LIST at the end of each mapping
32 */ 32 */
33const struct button_mapping button_context_standard[] = { 33static const struct button_mapping button_context_standard[] = {
34 { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, 34 { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE },
35 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 35 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
36 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, 36 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE },
@@ -48,7 +48,7 @@ const struct button_mapping button_context_standard[] = {
48 LAST_ITEM_IN_LIST 48 LAST_ITEM_IN_LIST
49}; /* button_context_standard */ 49}; /* button_context_standard */
50 50
51const struct button_mapping button_context_wps[] = { 51static const struct button_mapping button_context_wps[] = {
52 { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 52 { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
53 { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 53 { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
54 54
@@ -82,7 +82,7 @@ const struct button_mapping button_context_wps[] = {
82 LAST_ITEM_IN_LIST 82 LAST_ITEM_IN_LIST
83}; /* button_context_wps */ 83}; /* button_context_wps */
84 84
85const struct button_mapping button_context_settings[] = { 85static const struct button_mapping button_context_settings[] = {
86 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, 86 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE },
87 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 87 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
88 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 88 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -97,21 +97,21 @@ const struct button_mapping button_context_settings[] = {
97 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 97 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
98}; /* button_context_settings */ 98}; /* button_context_settings */
99 99
100const struct button_mapping button_context_list[] = { 100static const struct button_mapping button_context_list[] = {
101 { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, 101 { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC },
102 { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, 102 { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC },
103 103
104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
105}; /* button_context_list */ 105}; /* button_context_list */
106 106
107const struct button_mapping button_context_tree[] = { 107static const struct button_mapping button_context_tree[] = {
108 { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 108 { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP },
109 { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 109 { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
110 110
111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), 111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
112}; /* button_context_tree */ 112}; /* button_context_tree */
113 113
114const struct button_mapping button_context_listtree_scroll_without_combo[] = { 114static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
115 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 115 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
116 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 116 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
117 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 117 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
@@ -125,7 +125,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = {
125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
126}; /* button_context_listtree_scroll_without_combo */ 126}; /* button_context_listtree_scroll_without_combo */
127 127
128const struct button_mapping button_context_listtree_scroll_with_combo[] = { 128static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
129 { ACTION_TREE_ROOT_INIT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 129 { ACTION_TREE_ROOT_INIT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
130 { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, 130 { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC },
131 { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 131 { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
@@ -135,13 +135,13 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = {
135 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 135 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
136}; /* button_context_listtree_scroll_with_combo */ 136}; /* button_context_listtree_scroll_with_combo */
137 137
138const struct button_mapping button_context_yesno[] = { 138static const struct button_mapping button_context_yesno[] = {
139 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 139 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
140 140
141 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 141 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
142}; /* button_context_settings_yesno */ 142}; /* button_context_settings_yesno */
143 143
144const struct button_mapping button_context_quickscreen[] = { 144static const struct button_mapping button_context_quickscreen[] = {
145 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, 145 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
146 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, 146 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
147 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 147 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
@@ -155,7 +155,7 @@ const struct button_mapping button_context_quickscreen[] = {
155 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 155 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
156}; /* button_context_quickscreen */ 156}; /* button_context_quickscreen */
157 157
158const struct button_mapping button_context_settings_right_is_inc[] = { 158static const struct button_mapping button_context_settings_right_is_inc[] = {
159 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, 159 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE },
160 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
161 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, 161 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE },
@@ -174,7 +174,7 @@ const struct button_mapping button_context_settings_right_is_inc[] = {
174 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 174 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
175}; /* button_context_settings_right_is_inc */ 175}; /* button_context_settings_right_is_inc */
176 176
177const struct button_mapping button_context_pitchscreen[] = { 177static const struct button_mapping button_context_pitchscreen[] = {
178 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, 178 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
179 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 179 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
180 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, 180 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
@@ -189,7 +189,7 @@ const struct button_mapping button_context_pitchscreen[] = {
189 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 189 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
190}; /* button_context_pitchscreen */ 190}; /* button_context_pitchscreen */
191 191
192const struct button_mapping button_context_keyboard[] = { 192static const struct button_mapping button_context_keyboard[] = {
193 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 193 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
194 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 194 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
195 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 195 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -214,7 +214,7 @@ const struct button_mapping button_context_keyboard[] = {
214 LAST_ITEM_IN_LIST 214 LAST_ITEM_IN_LIST
215}; /* button_context_keyboard */ 215}; /* button_context_keyboard */
216 216
217const struct button_mapping button_context_bmark[] = { 217static const struct button_mapping button_context_bmark[] = {
218 { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE }, 218 { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE },
219 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, 219 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
220 { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE }, 220 { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index e248e2c4db..f630da025b 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -44,7 +44,7 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree
44*/ 44*/
45 45
46 46
47const struct button_mapping button_context_standard[] = { 47static const struct button_mapping button_context_standard[] = {
48 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 48 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
49 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 49 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
50 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 50 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
@@ -65,7 +65,7 @@ const struct button_mapping button_context_standard[] = {
65}; /* button_context_standard */ 65}; /* button_context_standard */
66 66
67 67
68const struct button_mapping button_context_wps[] = { 68static const struct button_mapping button_context_wps[] = {
69 { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 69 { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
70 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 70 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
71 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 71 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -92,7 +92,7 @@ const struct button_mapping button_context_wps[] = {
92 LAST_ITEM_IN_LIST 92 LAST_ITEM_IN_LIST
93}; /* button_context_wps */ 93}; /* button_context_wps */
94 94
95const struct button_mapping button_context_list[] = { 95static const struct button_mapping button_context_list[] = {
96 { ACTION_LISTTREE_PGUP, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, 96 { ACTION_LISTTREE_PGUP, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
97 { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_POWER|BUTTON_UP }, 97 { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_POWER|BUTTON_UP },
98 { ACTION_LISTTREE_PGUP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 98 { ACTION_LISTTREE_PGUP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
@@ -102,7 +102,7 @@ const struct button_mapping button_context_list[] = {
102 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 102 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
103}; /* button_context_list */ 103}; /* button_context_list */
104 104
105const struct button_mapping button_context_tree[] = { 105static const struct button_mapping button_context_tree[] = {
106 { ACTION_TREE_WPS, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 106 { ACTION_TREE_WPS, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
107 { ACTION_TREE_STOP, BUTTON_A, BUTTON_NONE }, 107 { ACTION_TREE_STOP, BUTTON_A, BUTTON_NONE },
108 { ACTION_TREE_STOP, BUTTON_A|BUTTON_REL, BUTTON_A }, 108 { ACTION_TREE_STOP, BUTTON_A|BUTTON_REL, BUTTON_A },
@@ -111,7 +111,7 @@ const struct button_mapping button_context_tree[] = {
111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) 111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
112}; /* button_context_tree */ 112}; /* button_context_tree */
113 113
114const struct button_mapping button_context_listtree_scroll_with_combo[] = { 114static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
115 { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, 115 { ACTION_NONE, BUTTON_POWER, BUTTON_NONE },
116 { ACTION_TREE_PGLEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, 116 { ACTION_TREE_PGLEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
117 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_POWER|BUTTON_LEFT }, 117 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_POWER|BUTTON_LEFT },
@@ -125,7 +125,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = {
125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
126}; 126};
127 127
128const struct button_mapping button_context_listtree_scroll_without_combo[] = { 128static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
129 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 129 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
130 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 130 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
131 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 131 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
@@ -138,7 +138,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = {
138 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 138 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
139}; 139};
140 140
141const struct button_mapping button_context_settings[] = { 141static const struct button_mapping button_context_settings[] = {
142 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 142 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
143 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 143 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
144 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 144 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
@@ -152,7 +152,7 @@ const struct button_mapping button_context_settings[] = {
152 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 152 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
153}; /* button_context_settings */ 153}; /* button_context_settings */
154 154
155const struct button_mapping button_context_settings_right_is_inc[] = { 155static const struct button_mapping button_context_settings_right_is_inc[] = {
156 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 156 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
157 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 157 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
158 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, 158 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -166,34 +166,34 @@ const struct button_mapping button_context_settings_right_is_inc[] = {
166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
167}; /* button_context_settingsgraphical */ 167}; /* button_context_settingsgraphical */
168 168
169const struct button_mapping button_context_yesno[] = { 169static const struct button_mapping button_context_yesno[] = {
170 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 170 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
171 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 171 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
172}; /* button_context_settings_yesno */ 172}; /* button_context_settings_yesno */
173 173
174const struct button_mapping button_context_colorchooser[] = { 174static const struct button_mapping button_context_colorchooser[] = {
175 { ACTION_STD_OK, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, 175 { ACTION_STD_OK, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
176 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 176 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
177}; /* button_context_settings_bmark */ 177}; /* button_context_settings_bmark */
178 178
179const struct button_mapping button_context_eq[] = { 179static const struct button_mapping button_context_eq[] = {
180 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, 180 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
181 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 181 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
182}; /* button_context_settings_bmark */ 182}; /* button_context_settings_bmark */
183 183
184const struct button_mapping button_context_bmark[] = { 184static const struct button_mapping button_context_bmark[] = {
185 { ACTION_BMS_DELETE, BUTTON_POWER, BUTTON_NONE }, 185 { ACTION_BMS_DELETE, BUTTON_POWER, BUTTON_NONE },
186 { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, 186 { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE },
187 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 187 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
188}; /* button_context_settings_bmark */ 188}; /* button_context_settings_bmark */
189 189
190const struct button_mapping button_context_time[] = { 190static const struct button_mapping button_context_time[] = {
191 { ACTION_STD_CANCEL, BUTTON_A, BUTTON_NONE }, 191 { ACTION_STD_CANCEL, BUTTON_A, BUTTON_NONE },
192 { ACTION_STD_OK, BUTTON_POWER, BUTTON_NONE }, 192 { ACTION_STD_OK, BUTTON_POWER, BUTTON_NONE },
193 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), 193 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
194}; /* button_context_settings_bmark */ 194}; /* button_context_settings_bmark */
195 195
196const struct button_mapping button_context_quickscreen[] = { 196static const struct button_mapping button_context_quickscreen[] = {
197 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, 197 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
198 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 198 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
199 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, 199 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
@@ -207,7 +207,7 @@ const struct button_mapping button_context_quickscreen[] = {
207 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 207 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
208}; /* button_context_quickscreen */ 208}; /* button_context_quickscreen */
209 209
210const struct button_mapping button_context_pitchscreen[] = { 210static const struct button_mapping button_context_pitchscreen[] = {
211 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, 211 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
212 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 212 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
213 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, 213 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
@@ -223,7 +223,7 @@ const struct button_mapping button_context_pitchscreen[] = {
223 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 223 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
224}; /* button_context_pitchcreen */ 224}; /* button_context_pitchcreen */
225 225
226const struct button_mapping button_context_keyboard[] = { 226static const struct button_mapping button_context_keyboard[] = {
227 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 227 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
228 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 228 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
229 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 229 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index b1355568ec..33bcb13269 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -31,7 +31,7 @@
31 * if there's no need to check the previous button's value, use BUTTON_NONE 31 * if there's no need to check the previous button's value, use BUTTON_NONE
32 * Insert LAST_ITEM_IN_LIST at the end of each mapping 32 * Insert LAST_ITEM_IN_LIST at the end of each mapping
33 */ 33 */
34const struct button_mapping button_context_standard[] = { 34static const struct button_mapping button_context_standard[] = {
35 { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, 35 { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE },
36 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 36 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
37 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 37 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -52,7 +52,7 @@ const struct button_mapping button_context_standard[] = {
52 LAST_ITEM_IN_LIST 52 LAST_ITEM_IN_LIST
53}; /* button_context_standard */ 53}; /* button_context_standard */
54 54
55const struct button_mapping remote_button_context_standard[] = { 55static const struct button_mapping remote_button_context_standard[] = {
56 { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 56 { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE },
57 { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 57 { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
58 { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 58 { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -61,7 +61,7 @@ const struct button_mapping remote_button_context_standard[] = {
61 LAST_ITEM_IN_LIST 61 LAST_ITEM_IN_LIST
62}; /* remote_button_context_standard */ 62}; /* remote_button_context_standard */
63 63
64const struct button_mapping button_context_wps[] = { 64static const struct button_mapping button_context_wps[] = {
65 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 65 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
66 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY }, 66 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY },
67 { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW}, 67 { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW},
@@ -90,7 +90,7 @@ const struct button_mapping button_context_wps[] = {
90 LAST_ITEM_IN_LIST 90 LAST_ITEM_IN_LIST
91}; /* button_context_wps */ 91}; /* button_context_wps */
92 92
93const struct button_mapping remote_button_context_wps[] = { 93static const struct button_mapping remote_button_context_wps[] = {
94 { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, 94 { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
95 { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY }, 95 { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY },
96 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW}, 96 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW},
@@ -111,7 +111,7 @@ const struct button_mapping remote_button_context_wps[] = {
111 LAST_ITEM_IN_LIST 111 LAST_ITEM_IN_LIST
112}; /* remote_button_context_wps */ 112}; /* remote_button_context_wps */
113 113
114const struct button_mapping button_context_settings[] = { 114static const struct button_mapping button_context_settings[] = {
115 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, 115 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE },
116 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 116 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
117 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 117 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -125,49 +125,49 @@ const struct button_mapping button_context_settings[] = {
125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
126}; /* button_context_settings */ 126}; /* button_context_settings */
127 127
128const struct button_mapping button_context_list[] = { 128static const struct button_mapping button_context_list[] = {
129 { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REL, BUTTON_REW }, 129 { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REL, BUTTON_REW },
130 { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REL, BUTTON_FF }, 130 { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REL, BUTTON_FF },
131 131
132 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 132 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
133}; /* button_context_list */ 133}; /* button_context_list */
134 134
135const struct button_mapping remote_button_context_list[] = { 135static const struct button_mapping remote_button_context_list[] = {
136 { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, 136 { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW },
137 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, 137 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
138 138
139 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 139 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
140}; /* button_context_list */ 140}; /* button_context_list */
141 141
142const struct button_mapping button_context_tree[] = { 142static const struct button_mapping button_context_tree[] = {
143 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 143 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
144 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 144 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
145 145
146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), 146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
147}; /* button_context_tree */ 147}; /* button_context_tree */
148 148
149const struct button_mapping remote_button_context_tree[] = { 149static const struct button_mapping remote_button_context_tree[] = {
150 { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, 150 { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
151 { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, 151 { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
152 152
153 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), 153 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
154}; /* button_context_tree */ 154}; /* button_context_tree */
155 155
156const struct button_mapping button_context_listtree_scroll_without_combo[] = { 156static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
157 { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, 157 { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW },
158 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, 158 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
159 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, 159 { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
160 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 160 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
161}; /* button_context_listtree_scroll_without_combo */ 161}; /* button_context_listtree_scroll_without_combo */
162 162
163const struct button_mapping remote_button_context_listtree_scroll_without_combo[] = { 163static const struct button_mapping remote_button_context_listtree_scroll_without_combo[] = {
164 { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, 164 { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW },
165 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 165 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
166 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 166 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
167 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 167 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
168}; /* button_context_listtree_scroll_without_combo */ 168}; /* button_context_listtree_scroll_without_combo */
169 169
170const struct button_mapping button_context_listtree_scroll_with_combo[] = { 170static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
171 { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, 171 { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW },
172 { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF }, 172 { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF },
173 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_PLAY }, 173 { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_PLAY },
@@ -182,7 +182,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = {
182 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 182 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
183}; /* button_context_listtree_scroll_with_combo */ 183}; /* button_context_listtree_scroll_with_combo */
184 184
185const struct button_mapping remote_button_context_listtree_scroll_with_combo[] = { 185static const struct button_mapping remote_button_context_listtree_scroll_with_combo[] = {
186 { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, 186 { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW },
187 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, 187 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF },
188 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_PLAY }, 188 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_PLAY },
@@ -197,12 +197,12 @@ const struct button_mapping remote_button_context_listtree_scroll_with_combo[]
197 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 197 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
198}; /* button_context_listtree_scroll_with_combo */ 198}; /* button_context_listtree_scroll_with_combo */
199 199
200const struct button_mapping button_context_yesno[] = { 200static const struct button_mapping button_context_yesno[] = {
201 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, 201 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE },
202 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 202 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
203}; /* button_context_settings_yesno */ 203}; /* button_context_settings_yesno */
204 204
205const struct button_mapping button_context_quickscreen[] = { 205static const struct button_mapping button_context_quickscreen[] = {
206 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, 206 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE },
207 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 207 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
208 { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 208 { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -215,7 +215,7 @@ const struct button_mapping button_context_quickscreen[] = {
215 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 215 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
216}; /* button_context_quickscreen */ 216}; /* button_context_quickscreen */
217 217
218const struct button_mapping remote_button_context_quickscreen[] = { 218static const struct button_mapping remote_button_context_quickscreen[] = {
219 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 219 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE },
220 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 220 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
221 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 221 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -228,7 +228,7 @@ const struct button_mapping remote_button_context_quickscreen[] = {
228 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 228 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
229}; /* button_context_quickscreen */ 229}; /* button_context_quickscreen */
230 230
231const struct button_mapping button_context_settings_right_is_inc[] = { 231static const struct button_mapping button_context_settings_right_is_inc[] = {
232 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, 232 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE },
233 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 233 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
234 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 234 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -245,7 +245,7 @@ const struct button_mapping button_context_settings_right_is_inc[] = {
245 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 245 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
246}; /* button_context_settings_right_is_inc */ 246}; /* button_context_settings_right_is_inc */
247 247
248const struct button_mapping button_context_pitchscreen[] = { 248static const struct button_mapping button_context_pitchscreen[] = {
249 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, 249 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE },
250 { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 250 { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
251 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 251 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -261,7 +261,7 @@ const struct button_mapping button_context_pitchscreen[] = {
261 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 261 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
262}; /* button_context_pitchscreen */ 262}; /* button_context_pitchscreen */
263 263
264const struct button_mapping remote_button_context_pitchscreen[] = { 264static const struct button_mapping remote_button_context_pitchscreen[] = {
265 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, 265 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE },
266 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 266 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
267 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 267 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -275,7 +275,7 @@ const struct button_mapping remote_button_context_pitchscreen[] = {
275 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 275 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
276}; /* button_context_pitchscreen */ 276}; /* button_context_pitchscreen */
277 277
278const struct button_mapping button_context_keyboard[] = { 278static const struct button_mapping button_context_keyboard[] = {
279 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 279 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
280 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 280 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
281 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 281 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -291,7 +291,7 @@ const struct button_mapping button_context_keyboard[] = {
291 LAST_ITEM_IN_LIST 291 LAST_ITEM_IN_LIST
292}; /* button_context_keyboard */ 292}; /* button_context_keyboard */
293 293
294const struct button_mapping button_context_bmark[] = { 294static const struct button_mapping button_context_bmark[] = {
295 { ACTION_BMS_DELETE, BUTTON_REW, BUTTON_NONE }, 295 { ACTION_BMS_DELETE, BUTTON_REW, BUTTON_NONE },
296 { ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE }, 296 { ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE },
297 { ACTION_BMS_EXIT, BUTTON_LEFT, BUTTON_NONE }, 297 { ACTION_BMS_EXIT, BUTTON_LEFT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 9de24e3fb5..823e07178a 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -45,7 +45,7 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree
45*/ 45*/
46 46
47 47
48const struct button_mapping button_context_standard[] = { 48static const struct button_mapping button_context_standard[] = {
49 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 49 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
50 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 50 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
51 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 51 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
@@ -66,7 +66,7 @@ const struct button_mapping button_context_standard[] = {
66}; /* button_context_standard */ 66}; /* button_context_standard */
67 67
68 68
69const struct button_mapping button_context_wps[] = { 69static const struct button_mapping button_context_wps[] = {
70 { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, 70 { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON },
71 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 71 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
72 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 72 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -93,7 +93,7 @@ const struct button_mapping button_context_wps[] = {
93 LAST_ITEM_IN_LIST 93 LAST_ITEM_IN_LIST
94}; /* button_context_wps */ 94}; /* button_context_wps */
95 95
96const struct button_mapping button_context_list[] = { 96static const struct button_mapping button_context_list[] = {
97 { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, 97 { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON },
98 { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, 98 { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP },
99 { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 99 { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
@@ -104,7 +104,7 @@ const struct button_mapping button_context_list[] = {
104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
105}; /* button_context_list */ 105}; /* button_context_list */
106 106
107const struct button_mapping button_context_tree[] = { 107static const struct button_mapping button_context_tree[] = {
108 { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, 108 { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON },
109 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, 109 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE },
110 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, 110 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
@@ -113,7 +113,7 @@ const struct button_mapping button_context_tree[] = {
113 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) 113 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
114}; /* button_context_tree */ 114}; /* button_context_tree */
115 115
116const struct button_mapping button_context_listtree_scroll_with_combo[] = { 116static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
117 { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, 117 { ACTION_NONE, BUTTON_ON, BUTTON_NONE },
118 { ACTION_TREE_PGLEFT, BUTTON_ON|BUTTON_LEFT, BUTTON_ON }, 118 { ACTION_TREE_PGLEFT, BUTTON_ON|BUTTON_LEFT, BUTTON_ON },
119 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_ON|BUTTON_LEFT }, 119 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_ON|BUTTON_LEFT },
@@ -127,7 +127,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = {
127 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 127 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
128}; 128};
129 129
130const struct button_mapping button_context_listtree_scroll_without_combo[] = { 130static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
131 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 131 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
132 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 132 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
133 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 133 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
@@ -140,7 +140,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = {
140 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 140 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
141}; 141};
142 142
143const struct button_mapping button_context_settings[] = { 143static const struct button_mapping button_context_settings[] = {
144 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 144 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
145 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 145 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
146 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 146 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
@@ -154,7 +154,7 @@ const struct button_mapping button_context_settings[] = {
154 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 154 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
155}; /* button_context_settings */ 155}; /* button_context_settings */
156 156
157const struct button_mapping button_context_settings_right_is_inc[] = { 157static const struct button_mapping button_context_settings_right_is_inc[] = {
158 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 158 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
159 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 159 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
160 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, 160 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -168,17 +168,17 @@ const struct button_mapping button_context_settings_right_is_inc[] = {
168 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 168 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
169}; /* button_context_settingsgraphical */ 169}; /* button_context_settingsgraphical */
170 170
171const struct button_mapping button_context_yesno[] = { 171static const struct button_mapping button_context_yesno[] = {
172 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 172 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
173 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 173 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
174}; /* button_context_settings_yesno */ 174}; /* button_context_settings_yesno */
175 175
176const struct button_mapping button_context_colorchooser[] = { 176static const struct button_mapping button_context_colorchooser[] = {
177 { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, 177 { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
178 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 178 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
179}; /* button_context_settings_bmark */ 179}; /* button_context_settings_bmark */
180 180
181const struct button_mapping button_context_eq[] = { 181static const struct button_mapping button_context_eq[] = {
182 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, 182 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
183 { ACTION_NONE, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, 183 { ACTION_NONE, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
184 { ACTION_SETTINGS_INCBIGSTEP, BUTTON_ON|BUTTON_RIGHT, BUTTON_ON }, 184 { ACTION_SETTINGS_INCBIGSTEP, BUTTON_ON|BUTTON_RIGHT, BUTTON_ON },
@@ -190,20 +190,20 @@ const struct button_mapping button_context_eq[] = {
190 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 190 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
191}; /* button_context_settings_bmark */ 191}; /* button_context_settings_bmark */
192 192
193const struct button_mapping button_context_bmark[] = { 193static const struct button_mapping button_context_bmark[] = {
194 { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, 194 { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
195 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, 195 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
196 { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE }, 196 { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE },
197 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 197 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
198}; /* button_context_settings_bmark */ 198}; /* button_context_settings_bmark */
199 199
200const struct button_mapping button_context_time[] = { 200static const struct button_mapping button_context_time[] = {
201 { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, 201 { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
202 { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE }, 202 { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE },
203 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), 203 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
204}; /* button_context_settings_bmark */ 204}; /* button_context_settings_bmark */
205 205
206const struct button_mapping button_context_quickscreen[] = { 206static const struct button_mapping button_context_quickscreen[] = {
207 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, 207 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
208 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 208 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
209 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, 209 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
@@ -217,7 +217,7 @@ const struct button_mapping button_context_quickscreen[] = {
217 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 217 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
218}; /* button_context_quickscreen */ 218}; /* button_context_quickscreen */
219 219
220const struct button_mapping button_context_pitchscreen[] = { 220static const struct button_mapping button_context_pitchscreen[] = {
221 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, 221 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
222 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 222 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
223 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, 223 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
@@ -234,7 +234,7 @@ const struct button_mapping button_context_pitchscreen[] = {
234 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 234 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
235}; /* button_context_pitchcreen */ 235}; /* button_context_pitchcreen */
236 236
237const struct button_mapping button_context_recscreen[] = { 237static const struct button_mapping button_context_recscreen[] = {
238 { ACTION_REC_PAUSE, BUTTON_ON, BUTTON_NONE }, 238 { ACTION_REC_PAUSE, BUTTON_ON, BUTTON_NONE },
239 { ACTION_REC_NEWFILE, BUTTON_REC, BUTTON_NONE }, 239 { ACTION_REC_NEWFILE, BUTTON_REC, BUTTON_NONE },
240 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 240 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
@@ -245,7 +245,7 @@ const struct button_mapping button_context_recscreen[] = {
245 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 245 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
246}; /* button_context_recscreen */ 246}; /* button_context_recscreen */
247 247
248const struct button_mapping button_context_keyboard[] = { 248static const struct button_mapping button_context_keyboard[] = {
249 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 249 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
250 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 250 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
251 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 251 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -270,7 +270,7 @@ const struct button_mapping button_context_keyboard[] = {
270 LAST_ITEM_IN_LIST 270 LAST_ITEM_IN_LIST
271}; /* button_context_keyboard */ 271}; /* button_context_keyboard */
272 272
273const struct button_mapping button_context_radio[] = { 273static const struct button_mapping button_context_radio[] = {
274 { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, 274 { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE },
275 { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, 275 { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT },
276 { ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE }, 276 { ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE },
@@ -287,7 +287,7 @@ const struct button_mapping button_context_radio[] = {
287 *****************************************************************************/ 287 *****************************************************************************/
288 288
289 289
290const struct button_mapping button_context_standard_h100remote[] = { 290static const struct button_mapping button_context_standard_h100remote[] = {
291 { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, 291 { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE },
292 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 292 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
293 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, 293 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE },
@@ -304,7 +304,7 @@ const struct button_mapping button_context_standard_h100remote[] = {
304 LAST_ITEM_IN_LIST 304 LAST_ITEM_IN_LIST
305}; /* button_context_standard_h100lcdremote */ 305}; /* button_context_standard_h100lcdremote */
306 306
307const struct button_mapping button_context_standard_h300lcdremote[] = { 307static const struct button_mapping button_context_standard_h300lcdremote[] = {
308 { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 308 { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE },
309 { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 309 { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
310 { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 310 { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -322,7 +322,7 @@ const struct button_mapping button_context_standard_h300lcdremote[] = {
322 322
323}; 323};
324 324
325const struct button_mapping button_context_wps_remotescommon[] = { 325static const struct button_mapping button_context_wps_remotescommon[] = {
326 { ACTION_WPS_PLAY, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, 326 { ACTION_WPS_PLAY, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON },
327 { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, 327 { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
328 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, 328 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW },
@@ -349,18 +349,18 @@ const struct button_mapping button_context_wps_remotescommon[] = {
349}; 349};
350 350
351 351
352const struct button_mapping button_context_wps_h100remote[] = { 352static const struct button_mapping button_context_wps_h100remote[] = {
353 { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, 353 { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON },
354 { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, 354 { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE },
355 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 355 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
356}; 356};
357const struct button_mapping button_context_wps_h300lcdremote[] = { 357static const struct button_mapping button_context_wps_h300lcdremote[] = {
358 { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, 358 { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU },
359 { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, 359 { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE },
360 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 360 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
361}; 361};
362 362
363const struct button_mapping button_context_list_h100remote[] = { 363static const struct button_mapping button_context_list_h100remote[] = {
364 { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE, BUTTON_NONE }, 364 { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE, BUTTON_NONE },
365 { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, 365 { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE },
366 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, 366 { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE },
@@ -368,24 +368,24 @@ const struct button_mapping button_context_list_h100remote[] = {
368 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 368 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
369}; 369};
370 370
371const struct button_mapping *button_context_list_h300lcdremote = 371static const struct button_mapping *button_context_list_h300lcdremote =
372 button_context_list_h100remote; 372 button_context_list_h100remote;
373 373
374 374
375const struct button_mapping button_context_tree_h100remote[] = { 375static const struct button_mapping button_context_tree_h100remote[] = {
376 { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE }, 376 { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE },
377 377
378 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) 378 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE)
379}; /* button_context_tree_h100remote */ 379}; /* button_context_tree_h100remote */
380 380
381const struct button_mapping button_context_tree_h300lcdremote[] = { 381static const struct button_mapping button_context_tree_h300lcdremote[] = {
382 { ACTION_TREE_STOP, BUTTON_RC_STOP, BUTTON_NONE }, 382 { ACTION_TREE_STOP, BUTTON_RC_STOP, BUTTON_NONE },
383 { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE }, 383 { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE },
384 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) 384 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE)
385}; /* button_context_tree_h300lcdremote */ 385}; /* button_context_tree_h300lcdremote */
386 386
387 387
388const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = { 388static const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = {
389 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_ON }, 389 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_ON },
390 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_REW }, 390 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_REW },
391 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_REW|BUTTON_REL }, 391 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_REW|BUTTON_REL },
@@ -401,7 +401,7 @@ const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] =
401 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 401 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
402}; 402};
403 403
404const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = { 404static const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = {
405 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_MENU }, 405 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_MENU },
406 { ACTION_TREE_PGLEFT, BUTTON_RC_SOURCE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_SOURCE }, 406 { ACTION_TREE_PGLEFT, BUTTON_RC_SOURCE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_SOURCE },
407 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_SOURCE|BUTTON_REL }, 407 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_SOURCE|BUTTON_REL },
@@ -414,7 +414,7 @@ const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[]
414 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 414 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
415}; 415};
416 416
417const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = { 417static const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = {
418 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 418 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
419 { ACTION_TREE_ROOT_INIT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_RC_VOL_DOWN }, 419 { ACTION_TREE_ROOT_INIT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_RC_VOL_DOWN },
420 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 420 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
@@ -423,7 +423,7 @@ const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[]
423 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 423 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
424}; 424};
425 425
426const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = { 426static const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = {
427 { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, 427 { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE },
428 { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, 428 { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW },
429 { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, 429 { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW },
@@ -436,7 +436,7 @@ const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[
436 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 436 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
437}; 437};
438 438
439const struct button_mapping button_context_settings_h100remote[] = { 439static const struct button_mapping button_context_settings_h100remote[] = {
440 { ACTION_SETTINGS_INC, BUTTON_RC_REW, BUTTON_NONE }, 440 { ACTION_SETTINGS_INC, BUTTON_RC_REW, BUTTON_NONE },
441 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 441 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
442 { ACTION_SETTINGS_DEC, BUTTON_RC_FF, BUTTON_NONE }, 442 { ACTION_SETTINGS_DEC, BUTTON_RC_FF, BUTTON_NONE },
@@ -448,7 +448,7 @@ const struct button_mapping button_context_settings_h100remote[] = {
448 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 448 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
449}; /* button_context_settings */ 449}; /* button_context_settings */
450 450
451const struct button_mapping button_context_settings_h300lcdremote[] = { 451static const struct button_mapping button_context_settings_h300lcdremote[] = {
452 { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, 452 { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE },
453 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 453 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
454 { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 454 { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -461,7 +461,7 @@ const struct button_mapping button_context_settings_h300lcdremote[] = {
461 461
462 462
463 463
464const struct button_mapping button_context_settingsgraphical_h100remote[] = { 464static const struct button_mapping button_context_settingsgraphical_h100remote[] = {
465 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, 465 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
466 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 466 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
467 { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, 467 { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE },
@@ -474,7 +474,7 @@ const struct button_mapping button_context_settingsgraphical_h100remote[] = {
474 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 474 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
475}; /* button_context_settingsgraphical_h100remote */ 475}; /* button_context_settingsgraphical_h100remote */
476 476
477const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { 477static const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = {
478 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, 478 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
479 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 479 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
480 { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, 480 { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE },
@@ -487,25 +487,25 @@ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] =
487 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 487 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
488}; /* button_context_settingsgraphical_h300remote */ 488}; /* button_context_settingsgraphical_h300remote */
489 489
490const struct button_mapping button_context_yesno_h100remote[] = { 490static const struct button_mapping button_context_yesno_h100remote[] = {
491 { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, 491 { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE },
492 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 492 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
493}; /* button_context_settings_yesno */ 493}; /* button_context_settings_yesno */
494 494
495const struct button_mapping *button_context_yesno_h300lcdremote = 495static const struct button_mapping *button_context_yesno_h300lcdremote =
496 button_context_yesno_h100remote; 496 button_context_yesno_h100remote;
497 497
498const struct button_mapping button_context_bmark_h100remote[] = { 498static const struct button_mapping button_context_bmark_h100remote[] = {
499 { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE }, 499 { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE },
500 { ACTION_BMS_SELECT, BUTTON_RC_MENU, BUTTON_NONE }, 500 { ACTION_BMS_SELECT, BUTTON_RC_MENU, BUTTON_NONE },
501 { ACTION_BMS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, 501 { ACTION_BMS_EXIT, BUTTON_RC_STOP, BUTTON_NONE },
502 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 502 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
503}; /* button_context_settings_bmark */ 503}; /* button_context_settings_bmark */
504 504
505const struct button_mapping *button_context_bmark_h300lcdremote = 505static const struct button_mapping *button_context_bmark_h300lcdremote =
506 button_context_bmark_h100remote; 506 button_context_bmark_h100remote;
507 507
508const struct button_mapping button_context_quickscreen_nonlcdremote[] = { 508static const struct button_mapping button_context_quickscreen_nonlcdremote[] = {
509 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 509 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE },
510 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 510 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
511 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 511 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -519,7 +519,7 @@ const struct button_mapping button_context_quickscreen_nonlcdremote[] = {
519 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 519 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
520}; /* button_context_quickscreen */ 520}; /* button_context_quickscreen */
521 521
522const struct button_mapping button_context_quickscreen_h100lcdremote[] = { 522static const struct button_mapping button_context_quickscreen_h100lcdremote[] = {
523 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 523 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE },
524 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 524 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
525 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 525 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -537,7 +537,7 @@ const struct button_mapping button_context_quickscreen_h100lcdremote[] = {
537 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 537 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
538}; /* button_context_quickscreen */ 538}; /* button_context_quickscreen */
539 539
540const struct button_mapping button_context_quickscreen_h300lcdremote[] = { 540static const struct button_mapping button_context_quickscreen_h300lcdremote[] = {
541 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 541 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE },
542 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 542 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
543 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 543 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -551,7 +551,7 @@ const struct button_mapping button_context_quickscreen_h300lcdremote[] = {
551 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 551 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
552}; /* button_context_quickscreen */ 552}; /* button_context_quickscreen */
553 553
554const struct button_mapping button_context_pitchscreen_nonlcdremote[] = { 554static const struct button_mapping button_context_pitchscreen_nonlcdremote[] = {
555 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, 555 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE },
556 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 556 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
557 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 557 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -567,7 +567,7 @@ const struct button_mapping button_context_pitchscreen_nonlcdremote[] = {
567 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 567 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
568}; /* button_context_pitchcreen */ 568}; /* button_context_pitchcreen */
569 569
570const struct button_mapping button_context_pitchscreen_h100lcdremote[] = { 570static const struct button_mapping button_context_pitchscreen_h100lcdremote[] = {
571 { ACTION_PS_INC_SMALL, BUTTON_RC_FF, BUTTON_NONE }, 571 { ACTION_PS_INC_SMALL, BUTTON_RC_FF, BUTTON_NONE },
572 { ACTION_PS_INC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 572 { ACTION_PS_INC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
573 { ACTION_PS_DEC_SMALL, BUTTON_RC_REW, BUTTON_NONE }, 573 { ACTION_PS_DEC_SMALL, BUTTON_RC_REW, BUTTON_NONE },
@@ -583,7 +583,7 @@ const struct button_mapping button_context_pitchscreen_h100lcdremote[] = {
583 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 583 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
584}; 584};
585 585
586const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { 586static const struct button_mapping button_context_pitchscreen_h300lcdremote[] = {
587 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, 587 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE },
588 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 588 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
589 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 589 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -599,7 +599,7 @@ const struct button_mapping button_context_pitchscreen_h300lcdremote[] = {
599 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 599 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
600}; 600};
601 601
602const struct button_mapping button_context_recscreen_h100remote[] = { 602static const struct button_mapping button_context_recscreen_h100remote[] = {
603 { ACTION_REC_LCD, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 603 { ACTION_REC_LCD, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
604 { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE }, 604 { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE },
605 { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE }, 605 { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE },
@@ -611,7 +611,7 @@ const struct button_mapping button_context_recscreen_h100remote[] = {
611 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 611 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
612}; /* button_context_recscreen_h100remote */ 612}; /* button_context_recscreen_h100remote */
613 613
614const struct button_mapping button_context_recscreen_h300lcdremote[] = { 614static const struct button_mapping button_context_recscreen_h300lcdremote[] = {
615 { ACTION_REC_LCD, BUTTON_RC_SOURCE, BUTTON_NONE }, 615 { ACTION_REC_LCD, BUTTON_RC_SOURCE, BUTTON_NONE },
616 { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE }, 616 { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE },
617 { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE }, 617 { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE },
@@ -623,7 +623,7 @@ const struct button_mapping button_context_recscreen_h300lcdremote[] = {
623 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 623 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
624}; /* button_context_recscreen_h300lcdremote */ 624}; /* button_context_recscreen_h300lcdremote */
625 625
626const struct button_mapping button_context_keyboard_h100remote[] = { 626static const struct button_mapping button_context_keyboard_h100remote[] = {
627 { ACTION_KBD_LEFT, BUTTON_RC_REW, BUTTON_NONE }, 627 { ACTION_KBD_LEFT, BUTTON_RC_REW, BUTTON_NONE },
628 { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 628 { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
629 { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, 629 { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE },
@@ -652,7 +652,7 @@ const struct button_mapping button_context_keyboard_h100remote[] = {
652 LAST_ITEM_IN_LIST 652 LAST_ITEM_IN_LIST
653}; /* button_context_keyboard_h100remote */ 653}; /* button_context_keyboard_h100remote */
654 654
655const struct button_mapping button_context_keyboard_h300lcdremote[] = { 655static const struct button_mapping button_context_keyboard_h300lcdremote[] = {
656 { ACTION_KBD_LEFT, BUTTON_RC_REW, BUTTON_NONE }, 656 { ACTION_KBD_LEFT, BUTTON_RC_REW, BUTTON_NONE },
657 { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 657 { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
658 { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, 658 { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE },
@@ -677,7 +677,7 @@ const struct button_mapping button_context_keyboard_h300lcdremote[] = {
677 LAST_ITEM_IN_LIST 677 LAST_ITEM_IN_LIST
678}; /* button_context_keyboard_h300lcdremote */ 678}; /* button_context_keyboard_h300lcdremote */
679 679
680const struct button_mapping button_context_radio_h100remote[] = { 680static const struct button_mapping button_context_radio_h100remote[] = {
681 { ACTION_FM_MENU, BUTTON_RC_MENU | BUTTON_REPEAT, BUTTON_NONE }, 681 { ACTION_FM_MENU, BUTTON_RC_MENU | BUTTON_REPEAT, BUTTON_NONE },
682 { ACTION_FM_PRESET, BUTTON_RC_MENU | BUTTON_REL, BUTTON_RC_MENU }, 682 { ACTION_FM_PRESET, BUTTON_RC_MENU | BUTTON_REL, BUTTON_RC_MENU },
683 { ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE }, 683 { ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE },
@@ -698,7 +698,7 @@ const struct button_mapping button_context_radio_h100remote[] = {
698 LAST_ITEM_IN_LIST 698 LAST_ITEM_IN_LIST
699}; 699};
700 700
701const struct button_mapping button_context_radio_h300lcdremote[] = { 701static const struct button_mapping button_context_radio_h300lcdremote[] = {
702 { ACTION_FM_MENU, BUTTON_RC_MENU | BUTTON_REPEAT, BUTTON_NONE }, 702 { ACTION_FM_MENU, BUTTON_RC_MENU | BUTTON_REPEAT, BUTTON_NONE },
703 { ACTION_FM_PRESET, BUTTON_RC_MENU | BUTTON_REL, BUTTON_RC_MENU }, 703 { ACTION_FM_PRESET, BUTTON_RC_MENU | BUTTON_REL, BUTTON_RC_MENU },
704 { ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE }, 704 { ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE },
@@ -857,7 +857,7 @@ static void remap_remote(void)
857} 857}
858 858
859 859
860const struct button_mapping* get_context_mapping_remote(int context) 860static const struct button_mapping* get_context_mapping_remote(int context)
861{ 861{
862 if(remote_type() != _remote_type) 862 if(remote_type() != _remote_type)
863 remap_remote(); 863 remap_remote();
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index b5d0fd7df0..6f12ac14c8 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -28,7 +28,7 @@
28 * if there's no need to check the previous button's value, use BUTTON_NONE 28 * if there's no need to check the previous button's value, use BUTTON_NONE
29 * Insert LAST_ITEM_IN_LIST at the end of each mapping 29 * Insert LAST_ITEM_IN_LIST at the end of each mapping
30 */ 30 */
31const struct button_mapping button_context_standard[] = { 31static const struct button_mapping button_context_standard[] = {
32 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 32 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
33 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 33 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
34 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 34 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
@@ -46,7 +46,7 @@ const struct button_mapping button_context_standard[] = {
46 LAST_ITEM_IN_LIST 46 LAST_ITEM_IN_LIST
47}; /* button_context_standard */ 47}; /* button_context_standard */
48 48
49const struct button_mapping button_context_wps[] = { 49static const struct button_mapping button_context_wps[] = {
50 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 50 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
51 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 51 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
52 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 52 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -71,7 +71,7 @@ const struct button_mapping button_context_wps[] = {
71 LAST_ITEM_IN_LIST 71 LAST_ITEM_IN_LIST
72}; /* button_context_wps */ 72}; /* button_context_wps */
73 73
74const struct button_mapping button_context_settings[] = { 74static const struct button_mapping button_context_settings[] = {
75 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 75 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
76 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 76 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
77 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 77 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
@@ -82,7 +82,7 @@ const struct button_mapping button_context_settings[] = {
82 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 82 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
83}; /* button_context_settings */ 83}; /* button_context_settings */
84 84
85const struct button_mapping button_context_settings_r_is_inc[] = { 85static const struct button_mapping button_context_settings_r_is_inc[] = {
86 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 86 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
87 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 87 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
88 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, 88 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -95,18 +95,18 @@ const struct button_mapping button_context_settings_r_is_inc[] = {
95 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 95 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
96}; /* button_context_settingsgraphical */ 96}; /* button_context_settingsgraphical */
97 97
98const struct button_mapping button_context_yesno[] = { 98static const struct button_mapping button_context_yesno[] = {
99 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 99 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
100 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 100 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
101}; /* button_context_settings_yesno */ 101}; /* button_context_settings_yesno */
102 102
103const struct button_mapping button_context_bmark[] = { 103static const struct button_mapping button_context_bmark[] = {
104 { ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE }, 104 { ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE },
105 { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, 105 { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE },
106 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), 106 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
107}; /* button_context_settings_bmark */ 107}; /* button_context_settings_bmark */
108 108
109const struct button_mapping button_context_quickscreen[] = { 109static const struct button_mapping button_context_quickscreen[] = {
110 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, 110 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
111 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 111 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
112 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, 112 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
@@ -119,7 +119,7 @@ const struct button_mapping button_context_quickscreen[] = {
119 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 119 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
120}; /* button_context_quickscreen */ 120}; /* button_context_quickscreen */
121 121
122const struct button_mapping button_context_pitchscreen[] = { 122static const struct button_mapping button_context_pitchscreen[] = {
123 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, 123 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
124 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 124 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
125 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, 125 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
@@ -134,7 +134,7 @@ const struct button_mapping button_context_pitchscreen[] = {
134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
135}; /* button_context_pitchcreen */ 135}; /* button_context_pitchcreen */
136 136
137const struct button_mapping button_context_keyboard[] = { 137static const struct button_mapping button_context_keyboard[] = {
138 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 138 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
139 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 139 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
140 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 140 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 0e0c02b6aa..26189d95fe 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -38,7 +38,7 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions
38 38
39*/ 39*/
40 40
41const struct button_mapping button_context_standard[] = { 41static const struct button_mapping button_context_standard[] = {
42 { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, 42 { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
43 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 43 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
44 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, 44 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
@@ -54,14 +54,14 @@ const struct button_mapping button_context_standard[] = {
54 54
55 LAST_ITEM_IN_LIST 55 LAST_ITEM_IN_LIST
56}; /* button_context_standard */ 56}; /* button_context_standard */
57const struct button_mapping button_context_tree[] = { 57static const struct button_mapping button_context_tree[] = {
58 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 58 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
59 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 59 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
60 60
61 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 61 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
62}; /* button_context_tree */ 62}; /* button_context_tree */
63 63
64const struct button_mapping button_context_tree_scroll_lr[] = { 64static const struct button_mapping button_context_tree_scroll_lr[] = {
65 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 65 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
66 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 66 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
67 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 67 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
@@ -74,7 +74,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
74 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 74 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
75}; 75};
76 76
77const struct button_mapping button_context_wps[] = { 77static const struct button_mapping button_context_wps[] = {
78 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 78 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
79 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 79 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
80 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 80 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -95,7 +95,7 @@ const struct button_mapping button_context_wps[] = {
95 LAST_ITEM_IN_LIST, 95 LAST_ITEM_IN_LIST,
96}; /* button_context_wps */ 96}; /* button_context_wps */
97 97
98const struct button_mapping button_context_settings[] = { 98static const struct button_mapping button_context_settings[] = {
99 { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, 99 { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
100 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 100 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
101 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, 101 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
@@ -110,19 +110,19 @@ const struct button_mapping button_context_settings[] = {
110 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 110 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
111}; /* button_context_settings */ 111}; /* button_context_settings */
112 112
113const struct button_mapping button_context_yesno[] = { 113static const struct button_mapping button_context_yesno[] = {
114 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 114 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
115 LAST_ITEM_IN_LIST 115 LAST_ITEM_IN_LIST
116}; /* button_context_settings_yesno */ 116}; /* button_context_settings_yesno */
117 117
118const struct button_mapping button_context_bmark[] = { 118static const struct button_mapping button_context_bmark[] = {
119 { ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, 119 { ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
120 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, 120 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
121 { ACTION_BMS_EXIT, BUTTON_PLAY, BUTTON_NONE }, 121 { ACTION_BMS_EXIT, BUTTON_PLAY, BUTTON_NONE },
122 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), 122 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
123}; /* button_context_settings_bmark */ 123}; /* button_context_settings_bmark */
124 124
125const struct button_mapping button_context_quickscreen[] = { 125static const struct button_mapping button_context_quickscreen[] = {
126 { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE }, 126 { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE },
127 { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, 127 { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
128 { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, 128 { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
@@ -134,7 +134,7 @@ const struct button_mapping button_context_quickscreen[] = {
134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
135}; /* button_context_quickscreen */ 135}; /* button_context_quickscreen */
136 136
137const struct button_mapping button_context_pitchscreen[] = { 137static const struct button_mapping button_context_pitchscreen[] = {
138 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, 138 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE },
139 { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 139 { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
140 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, 140 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE },
@@ -150,7 +150,7 @@ const struct button_mapping button_context_pitchscreen[] = {
150 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 150 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
151}; /* button_context_pitchscreen */ 151}; /* button_context_pitchscreen */
152 152
153const struct button_mapping button_context_keyboard[] = { 153static const struct button_mapping button_context_keyboard[] = {
154 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 154 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
155 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 155 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
156 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 156 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-newtarget.c b/apps/keymaps/keymap-newtarget.c
index ab1e157937..69da4efc44 100644
--- a/apps/keymaps/keymap-newtarget.c
+++ b/apps/keymaps/keymap-newtarget.c
@@ -42,12 +42,12 @@
42 * if there's no need to check the previous button's value, use BUTTON_NONE 42 * if there's no need to check the previous button's value, use BUTTON_NONE
43 * Insert LAST_ITEM_IN_LIST at the end of each mapping 43 * Insert LAST_ITEM_IN_LIST at the end of each mapping
44 */ 44 */
45const struct button_mapping button_context_standard[] = { 45static const struct button_mapping button_context_standard[] = {
46 46
47 LAST_ITEM_IN_LIST 47 LAST_ITEM_IN_LIST
48}; /* button_context_standard */ 48}; /* button_context_standard */
49 49
50const struct button_mapping button_context_wps[] = { 50static const struct button_mapping button_context_wps[] = {
51 51
52 LAST_ITEM_IN_LIST 52 LAST_ITEM_IN_LIST
53}; /* button_context_wps */ 53}; /* button_context_wps */
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index bc92fc47ba..4274afc29e 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -32,7 +32,7 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions
32 32
33*/ 33*/
34 34
35const struct button_mapping button_context_standard[] = { 35static const struct button_mapping button_context_standard[] = {
36 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 36 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
37 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 37 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
38 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 38 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
@@ -47,7 +47,7 @@ const struct button_mapping button_context_standard[] = {
47 LAST_ITEM_IN_LIST 47 LAST_ITEM_IN_LIST
48}; 48};
49 49
50const struct button_mapping button_context_wps[] = { 50static const struct button_mapping button_context_wps[] = {
51 { ACTION_WPS_PLAY, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, 51 { ACTION_WPS_PLAY, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
52 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 52 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
53 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 53 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -68,7 +68,7 @@ const struct button_mapping button_context_wps[] = {
68 LAST_ITEM_IN_LIST 68 LAST_ITEM_IN_LIST
69}; 69};
70 70
71const struct button_mapping button_context_settings[] = { 71static const struct button_mapping button_context_settings[] = {
72 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 72 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
73 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 73 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
74 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 74 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
@@ -79,13 +79,15 @@ const struct button_mapping button_context_settings[] = {
79 79
80 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 80 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
81}; 81};
82const struct button_mapping button_context_tree[] = { 82
83static const struct button_mapping button_context_tree[] = {
83 { ACTION_TREE_WPS, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 84 { ACTION_TREE_WPS, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
84 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, 85 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE },
85 86
86 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 87 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
87}; /* button_context_listtree */ 88}; /* button_context_listtree */
88const struct button_mapping button_context_tree_scroll_lr[] = { 89
90static const struct button_mapping button_context_tree_scroll_lr[] = {
89 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 91 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
90 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 92 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
91 { ACTION_TREE_PGLEFT, BUTTON_MENU|BUTTON_LEFT, BUTTON_NONE }, 93 { ACTION_TREE_PGLEFT, BUTTON_MENU|BUTTON_LEFT, BUTTON_NONE },
@@ -101,13 +103,13 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
101 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 103 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
102}; 104};
103 105
104const struct button_mapping button_context_yesno[] = { 106static const struct button_mapping button_context_yesno[] = {
105 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, 107 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE },
106 108
107 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 109 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
108}; 110};
109 111
110struct button_mapping button_context_bmark[] = { 112static const struct button_mapping button_context_bmark[] = {
111 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 113 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
112 { ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 114 { ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
113 { ACTION_BMS_EXIT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 115 { ACTION_BMS_EXIT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -116,7 +118,7 @@ struct button_mapping button_context_bmark[] = {
116 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 118 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
117}; /* button_context_settings_bmark */ 119}; /* button_context_settings_bmark */
118 120
119const struct button_mapping button_context_pitchscreen[] = { 121static const struct button_mapping button_context_pitchscreen[] = {
120 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, 122 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
121 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 123 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
122 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, 124 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
@@ -132,7 +134,7 @@ const struct button_mapping button_context_pitchscreen[] = {
132 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
133}; /* button_context_quickscreen */ 135}; /* button_context_quickscreen */
134 136
135const struct button_mapping button_context_recscreen[] = { 137static const struct button_mapping button_context_recscreen[] = {
136 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 138 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
137 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 139 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
138 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 140 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
@@ -142,7 +144,7 @@ const struct button_mapping button_context_recscreen[] = {
142 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 144 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
143}; /* button_context_recscreen */ 145}; /* button_context_recscreen */
144 146
145const struct button_mapping button_context_keyboard[] = { 147static const struct button_mapping button_context_keyboard[] = {
146 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 148 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
147 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 149 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
148 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 150 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -158,7 +160,7 @@ const struct button_mapping button_context_keyboard[] = {
158 LAST_ITEM_IN_LIST 160 LAST_ITEM_IN_LIST
159}; /* button_context_keyboard */ 161}; /* button_context_keyboard */
160 162
161const struct button_mapping button_context_radio[] = { 163static const struct button_mapping button_context_radio[] = {
162 { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE }, 164 { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE },
163 { ACTION_FM_RECORD_DBLPRE, BUTTON_MENU, BUTTON_NONE}, 165 { ACTION_FM_RECORD_DBLPRE, BUTTON_MENU, BUTTON_NONE},
164 { ACTION_FM_RECORD, BUTTON_MENU | BUTTON_REL, BUTTON_NONE }, 166 { ACTION_FM_RECORD, BUTTON_MENU | BUTTON_REL, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 29e45a1d33..82508b5c48 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -84,7 +84,7 @@ static const struct button_mapping button_context_yesno[] = {
84 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 84 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
85}; /* button_context_settings_yesno */ 85}; /* button_context_settings_yesno */
86 86
87struct button_mapping button_context_bmark[] = { 87static const struct button_mapping button_context_bmark[] = {
88 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, 88 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
89 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON }, 89 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
90 { ACTION_BMS_EXIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, 90 { ACTION_BMS_EXIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index c51bde9a4b..03f26a32be 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -157,7 +157,7 @@ static const struct button_mapping button_context_pitchscreen[] = {
157 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 157 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
158}; /* button_context_pitchcreen */ 158}; /* button_context_pitchcreen */
159 159
160const struct button_mapping button_context_recscreen[] = { 160static const struct button_mapping button_context_recscreen[] = {
161 { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, 161 { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
162 { ACTION_REC_F2, BUTTON_F2, BUTTON_NONE }, 162 { ACTION_REC_F2, BUTTON_F2, BUTTON_NONE },
163 { ACTION_REC_F3, BUTTON_F3, BUTTON_NONE }, 163 { ACTION_REC_F3, BUTTON_F3, BUTTON_NONE },
@@ -169,7 +169,7 @@ const struct button_mapping button_context_recscreen[] = {
169 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 169 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
170}; /* button_context_recscreen */ 170}; /* button_context_recscreen */
171 171
172const struct button_mapping button_context_keyboard[] = { 172static const struct button_mapping button_context_keyboard[] = {
173 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 173 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
174 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 174 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
175 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 175 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -192,7 +192,7 @@ const struct button_mapping button_context_keyboard[] = {
192 LAST_ITEM_IN_LIST 192 LAST_ITEM_IN_LIST
193}; /* button_context_keyboard */ 193}; /* button_context_keyboard */
194 194
195struct button_mapping button_context_bmark[] = { 195static const struct button_mapping button_context_bmark[] = {
196 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, 196 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
197 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON }, 197 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
198 { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE }, 198 { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE },
@@ -202,7 +202,7 @@ struct button_mapping button_context_bmark[] = {
202 202
203}; /* button_context_settings_bmark */ 203}; /* button_context_settings_bmark */
204 204
205const struct button_mapping button_context_radio[] = { 205static const struct button_mapping button_context_radio[] = {
206 { ACTION_FM_MENU, BUTTON_F1, BUTTON_NONE }, 206 { ACTION_FM_MENU, BUTTON_F1, BUTTON_NONE },
207 { ACTION_FM_PRESET, BUTTON_F2, BUTTON_NONE }, 207 { ACTION_FM_PRESET, BUTTON_F2, BUTTON_NONE },
208 { ACTION_FM_RECORD, BUTTON_F3, BUTTON_NONE }, 208 { ACTION_FM_RECORD, BUTTON_F3, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 0bc4833077..82cfd27c5d 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -40,7 +40,7 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions
40 **/ 40 **/
41 41
42/** Standard Button Contexts **/ 42/** Standard Button Contexts **/
43const struct button_mapping button_context_standard[] = { 43static const struct button_mapping button_context_standard[] = {
44 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 44 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
45 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 45 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
46 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 46 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
@@ -58,7 +58,7 @@ const struct button_mapping button_context_standard[] = {
58 LAST_ITEM_IN_LIST 58 LAST_ITEM_IN_LIST
59}; /* button_context_standard */ 59}; /* button_context_standard */
60 60
61const struct button_mapping remote_button_context_standard[] = { 61static const struct button_mapping remote_button_context_standard[] = {
62 { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, 62 { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE },
63 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 63 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
64 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, 64 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE },
@@ -74,7 +74,7 @@ const struct button_mapping remote_button_context_standard[] = {
74}; /* remote_button_context_standard */ 74}; /* remote_button_context_standard */
75 75
76/** Bookmark Screen **/ 76/** Bookmark Screen **/
77const struct button_mapping button_context_bmark[] = { 77static const struct button_mapping button_context_bmark[] = {
78 { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, 78 { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
79 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, 79 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
80 { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, 80 { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_REC },
@@ -83,7 +83,7 @@ const struct button_mapping button_context_bmark[] = {
83}; /* button_context_settings_bmark */ 83}; /* button_context_settings_bmark */
84 84
85/** FM Radio Screen **/ 85/** FM Radio Screen **/
86const struct button_mapping button_context_radio[] = { 86static const struct button_mapping button_context_radio[] = {
87 { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, 87 { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE },
88 { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, 88 { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT },
89 { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE }, 89 { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE },
@@ -98,7 +98,7 @@ const struct button_mapping button_context_radio[] = {
98}; /* button_context_radio */ 98}; /* button_context_radio */
99 99
100/** Keyboard **/ 100/** Keyboard **/
101const struct button_mapping button_context_keyboard[] = { 101static const struct button_mapping button_context_keyboard[] = {
102 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 102 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
103 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 103 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
104 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 104 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -115,13 +115,13 @@ const struct button_mapping button_context_keyboard[] = {
115}; /* button_context_keyboard */ 115}; /* button_context_keyboard */
116 116
117/* Main Menu Context Menu **/ 117/* Main Menu Context Menu **/
118const struct button_mapping button_context_mainmenu[] = { 118static const struct button_mapping button_context_mainmenu[] = {
119 { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, 119 { ACTION_NONE, BUTTON_POWER, BUTTON_NONE },
120 120
121 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 121 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
122}; /* button_context_mainmenu */ 122}; /* button_context_mainmenu */
123 123
124const struct button_mapping remote_button_context_mainmenu[] = { 124static const struct button_mapping remote_button_context_mainmenu[] = {
125 { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 125 { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
126 { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, 126 { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE },
127 127
@@ -129,7 +129,7 @@ const struct button_mapping remote_button_context_mainmenu[] = {
129}; /* remote_button_context_mainmenu */ 129}; /* remote_button_context_mainmenu */
130 130
131/** Pitchscreen **/ 131/** Pitchscreen **/
132const struct button_mapping button_context_pitchscreen[] = { 132static const struct button_mapping button_context_pitchscreen[] = {
133 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, 133 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
134 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 134 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
135 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, 135 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
@@ -145,7 +145,7 @@ const struct button_mapping button_context_pitchscreen[] = {
145 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 145 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
146}; /* button_context_pitchscreen */ 146}; /* button_context_pitchscreen */
147 147
148const struct button_mapping remote_button_context_pitchscreen[] = { 148static const struct button_mapping remote_button_context_pitchscreen[] = {
149 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, 149 { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE },
150 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 150 { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
151 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 151 { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -161,7 +161,7 @@ const struct button_mapping remote_button_context_pitchscreen[] = {
161}; /* remote_button_context_pitchscreen */ 161}; /* remote_button_context_pitchscreen */
162 162
163/** Quickscreen **/ 163/** Quickscreen **/
164const struct button_mapping button_context_quickscreen[] = { 164static const struct button_mapping button_context_quickscreen[] = {
165 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, 165 { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
166 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 166 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
167 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, 167 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
@@ -175,7 +175,7 @@ const struct button_mapping button_context_quickscreen[] = {
175 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 175 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
176}; /* button_context_quickscreen */ 176}; /* button_context_quickscreen */
177 177
178const struct button_mapping remote_button_context_quickscreen[] = { 178static const struct button_mapping remote_button_context_quickscreen[] = {
179 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, 179 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE },
180 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 180 { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
181 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 181 { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -189,7 +189,7 @@ const struct button_mapping remote_button_context_quickscreen[] = {
189}; /* remote_button_context_quickscreen */ 189}; /* remote_button_context_quickscreen */
190 190
191/** Recording Screen **/ 191/** Recording Screen **/
192const struct button_mapping button_context_recscreen[] = { 192static const struct button_mapping button_context_recscreen[] = {
193 { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 193 { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
194 { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 194 { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
195 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, 195 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
@@ -203,7 +203,7 @@ const struct button_mapping button_context_recscreen[] = {
203}; /* button_context_recscreen */ 203}; /* button_context_recscreen */
204 204
205/** Settings - General Mappings **/ 205/** Settings - General Mappings **/
206const struct button_mapping button_context_settings[] = { 206static const struct button_mapping button_context_settings[] = {
207 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 207 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
208 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 208 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
209 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 209 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
@@ -215,7 +215,7 @@ const struct button_mapping button_context_settings[] = {
215}; /* button_context_settings */ 215}; /* button_context_settings */
216 216
217/** Settings - Using Sliders **/ 217/** Settings - Using Sliders **/
218const struct button_mapping button_context_settings_r_is_inc[] = { 218static const struct button_mapping button_context_settings_r_is_inc[] = {
219 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 219 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
220 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 220 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
221 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, 221 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -229,7 +229,7 @@ const struct button_mapping button_context_settings_r_is_inc[] = {
229 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 229 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
230}; /* button_context_settings_r_is_inc */ 230}; /* button_context_settings_r_is_inc */
231 231
232const struct button_mapping remote_button_context_settings_r_is_inc[] = { 232static const struct button_mapping remote_button_context_settings_r_is_inc[] = {
233 { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, 233 { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE },
234 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 234 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
235 { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 235 { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -243,7 +243,7 @@ const struct button_mapping remote_button_context_settings_r_is_inc[] = {
243}; /* remote_button_context_settings_r_is_inc */ 243}; /* remote_button_context_settings_r_is_inc */
244 244
245/** Settings - Time/Date **/ 245/** Settings - Time/Date **/
246const struct button_mapping button_context_settings_time[] = { 246static const struct button_mapping button_context_settings_time[] = {
247 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 247 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
248 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 248 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
249 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 249 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
@@ -252,7 +252,7 @@ const struct button_mapping button_context_settings_time[] = {
252}; /* button_context_settings */ 252}; /* button_context_settings */
253 253
254/** Tree **/ 254/** Tree **/
255const struct button_mapping button_context_tree[] = { 255static const struct button_mapping button_context_tree[] = {
256 { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, 256 { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE },
257 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 257 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
258 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 258 { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
@@ -260,7 +260,7 @@ const struct button_mapping button_context_tree[] = {
260 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 260 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
261}; /* button_context_tree */ 261}; /* button_context_tree */
262 262
263const struct button_mapping remote_button_context_tree[] = { 263static const struct button_mapping remote_button_context_tree[] = {
264 { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 264 { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
265 { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, 265 { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE },
266 { ACTION_NONE, BUTTON_RC_MODE, BUTTON_NONE }, 266 { ACTION_NONE, BUTTON_RC_MODE, BUTTON_NONE },
@@ -269,7 +269,7 @@ const struct button_mapping remote_button_context_tree[] = {
269 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 269 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
270}; /* remote_button_context_tree */ 270}; /* remote_button_context_tree */
271 271
272const struct button_mapping button_context_tree_scroll_lr[] = { 272static const struct button_mapping button_context_tree_scroll_lr[] = {
273 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 273 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
274 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 274 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
275 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 275 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
@@ -284,7 +284,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
284}; /* button_context_tree_scroll_lr */ 284}; /* button_context_tree_scroll_lr */
285 285
286/** While-Playing Screen (WPS) **/ 286/** While-Playing Screen (WPS) **/
287const struct button_mapping button_context_wps[] = { 287static const struct button_mapping button_context_wps[] = {
288 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 288 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
289 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 289 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
290 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 290 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -307,7 +307,7 @@ const struct button_mapping button_context_wps[] = {
307 LAST_ITEM_IN_LIST 307 LAST_ITEM_IN_LIST
308}; /* button_context_wps */ 308}; /* button_context_wps */
309 309
310const struct button_mapping remote_button_context_wps[] = { 310static const struct button_mapping remote_button_context_wps[] = {
311 { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, 311 { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
312 { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, 312 { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
313 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, 313 { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW },
@@ -331,7 +331,7 @@ const struct button_mapping remote_button_context_wps[] = {
331}; /* remote_button_context_wps */ 331}; /* remote_button_context_wps */
332 332
333/** Yes/No Screen **/ 333/** Yes/No Screen **/
334const struct button_mapping button_context_yesnoscreen[] = { 334static const struct button_mapping button_context_yesnoscreen[] = {
335 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 335 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
336 LAST_ITEM_IN_LIST 336 LAST_ITEM_IN_LIST
337}; /* button_context_settings_yesnoscreen */ 337}; /* button_context_settings_yesnoscreen */
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-05 22:55:51 +0000