diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-agptekrocker.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-clip.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-erosq.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-fiiom3k.c | 8 | ||||
-rw-r--r-- | apps/keymaps/keymap-fiiom3klinux.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-fuzeplus.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-ma.c | 6 | ||||
-rw-r--r-- | apps/keymaps/keymap-nwz.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-ondavx777.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-rk27xx-generic.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-shanlingq1.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-xduoox20.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-xduoox3ii.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-ypr0.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-ypr1.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-zenxfi2.c | 5 |
17 files changed, 20 insertions, 66 deletions
diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c index 158de8d3c8..5ca834ab51 100644 --- a/apps/keymaps/keymap-agptekrocker.c +++ b/apps/keymaps/keymap-agptekrocker.c | |||
@@ -221,17 +221,14 @@ static const struct button_mapping button_context_bmark[] = { | |||
221 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 221 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
222 | const struct button_mapping* get_context_mapping(int context) | 222 | const struct button_mapping* get_context_mapping(int context) |
223 | { | 223 | { |
224 | switch (context) | 224 | switch (context & ~CONTEXT_LOCKED) |
225 | { | 225 | { |
226 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
227 | case CONTEXT_STD: | 226 | case CONTEXT_STD: |
228 | return button_context_standard; | 227 | return button_context_standard; |
229 | 228 | ||
230 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
231 | case CONTEXT_WPS: | 229 | case CONTEXT_WPS: |
232 | return button_context_wps; | 230 | return button_context_wps; |
233 | 231 | ||
234 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
235 | case CONTEXT_MAINMENU: | 232 | case CONTEXT_MAINMENU: |
236 | return button_context_mainmenu; | 233 | return button_context_mainmenu; |
237 | case CONTEXT_TREE: | 234 | case CONTEXT_TREE: |
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index cf1f283d24..494c9a734c 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -399,13 +399,11 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | |||
399 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 399 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
400 | const struct button_mapping* get_context_mapping(int context) | 400 | const struct button_mapping* get_context_mapping(int context) |
401 | { | 401 | { |
402 | switch (context) | 402 | switch (context & ~CONTEXT_LOCKED) |
403 | { | 403 | { |
404 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
405 | case CONTEXT_STD: | 404 | case CONTEXT_STD: |
406 | return button_context_standard; | 405 | return button_context_standard; |
407 | 406 | ||
408 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
409 | case CONTEXT_WPS: | 407 | case CONTEXT_WPS: |
410 | return button_context_wps; | 408 | return button_context_wps; |
411 | 409 | ||
@@ -416,7 +414,6 @@ const struct button_mapping* get_context_mapping(int context) | |||
416 | return button_context_listtree_scroll_without_combo; | 414 | return button_context_listtree_scroll_without_combo; |
417 | else | 415 | else |
418 | return button_context_listtree_scroll_with_combo; | 416 | return button_context_listtree_scroll_with_combo; |
419 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
420 | case CONTEXT_MAINMENU: | 417 | case CONTEXT_MAINMENU: |
421 | return button_context_mainmenu; | 418 | return button_context_mainmenu; |
422 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 419 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c index 7e2643a318..054da96201 100644 --- a/apps/keymaps/keymap-erosq.c +++ b/apps/keymaps/keymap-erosq.c | |||
@@ -194,17 +194,14 @@ static const struct button_mapping button_context_bmark[] = { | |||
194 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 194 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
195 | const struct button_mapping* get_context_mapping(int context) | 195 | const struct button_mapping* get_context_mapping(int context) |
196 | { | 196 | { |
197 | switch (context) | 197 | switch (context & ~CONTEXT_LOCKED) |
198 | { | 198 | { |
199 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
200 | case CONTEXT_STD: | 199 | case CONTEXT_STD: |
201 | return button_context_standard; | 200 | return button_context_standard; |
202 | 201 | ||
203 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
204 | case CONTEXT_WPS: | 202 | case CONTEXT_WPS: |
205 | return button_context_wps; | 203 | return button_context_wps; |
206 | 204 | ||
207 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
208 | case CONTEXT_MAINMENU: | 205 | case CONTEXT_MAINMENU: |
209 | return button_context_mainmenu; | 206 | return button_context_mainmenu; |
210 | 207 | ||
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c index 8b9cce2493..01fe3a689c 100644 --- a/apps/keymaps/keymap-fiiom3k.c +++ b/apps/keymaps/keymap-fiiom3k.c | |||
@@ -324,18 +324,16 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = { | |||
324 | 324 | ||
325 | const struct button_mapping* get_context_mapping(int context) | 325 | const struct button_mapping* get_context_mapping(int context) |
326 | { | 326 | { |
327 | switch (context) | 327 | switch (context & ~CONTEXT_LOCKED) |
328 | { | 328 | { |
329 | default: | 329 | default: |
330 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
331 | case CONTEXT_STD: | 330 | case CONTEXT_STD: |
332 | return button_context_standard; | 331 | return button_context_standard; |
333 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
334 | return button_context_wps_locked; | ||
335 | case CONTEXT_WPS: | 332 | case CONTEXT_WPS: |
333 | if (context & CONTEXT_LOCKED) | ||
334 | return button_context_wps_locked; | ||
336 | return button_context_wps; | 335 | return button_context_wps; |
337 | case CONTEXT_TREE: | 336 | case CONTEXT_TREE: |
338 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
339 | case CONTEXT_MAINMENU: | 337 | case CONTEXT_MAINMENU: |
340 | if (global_settings.hold_lr_for_scroll_in_list) | 338 | if (global_settings.hold_lr_for_scroll_in_list) |
341 | return button_context_tree_scroll_lr; | 339 | return button_context_tree_scroll_lr; |
diff --git a/apps/keymaps/keymap-fiiom3klinux.c b/apps/keymaps/keymap-fiiom3klinux.c index 98aef7be41..79a7687501 100644 --- a/apps/keymaps/keymap-fiiom3klinux.c +++ b/apps/keymaps/keymap-fiiom3klinux.c | |||
@@ -192,11 +192,10 @@ static const struct button_mapping button_context_yesnoscreen[] = { | |||
192 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 192 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
193 | const struct button_mapping* get_context_mapping(int context) | 193 | const struct button_mapping* get_context_mapping(int context) |
194 | { | 194 | { |
195 | switch (context) | 195 | switch (context & ~CONTEXT_LOCKED) |
196 | { | 196 | { |
197 | case CONTEXT_LIST: | 197 | case CONTEXT_LIST: |
198 | return button_context_list; | 198 | return button_context_list; |
199 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
200 | case CONTEXT_STD: | 199 | case CONTEXT_STD: |
201 | return button_context_standard; | 200 | return button_context_standard; |
202 | case CONTEXT_BOOKMARKSCREEN: | 201 | case CONTEXT_BOOKMARKSCREEN: |
@@ -215,10 +214,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
215 | case CONTEXT_SETTINGS_RECTRIGGER: | 214 | case CONTEXT_SETTINGS_RECTRIGGER: |
216 | return button_context_settings_vol_is_inc; | 215 | return button_context_settings_vol_is_inc; |
217 | case CONTEXT_TREE: | 216 | case CONTEXT_TREE: |
218 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
219 | case CONTEXT_MAINMENU: | 217 | case CONTEXT_MAINMENU: |
220 | return button_context_tree; | 218 | return button_context_tree; |
221 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
222 | case CONTEXT_WPS: | 219 | case CONTEXT_WPS: |
223 | return button_context_wps; | 220 | return button_context_wps; |
224 | case CONTEXT_YESNOSCREEN: | 221 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c index 01032ddf07..052f11085e 100644 --- a/apps/keymaps/keymap-fuzeplus.c +++ b/apps/keymaps/keymap-fuzeplus.c | |||
@@ -407,17 +407,14 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | |||
407 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 407 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
408 | const struct button_mapping* get_context_mapping(int context) | 408 | const struct button_mapping* get_context_mapping(int context) |
409 | { | 409 | { |
410 | switch (context) | 410 | switch (context & ~CONTEXT_LOCKED) |
411 | { | 411 | { |
412 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
413 | case CONTEXT_STD: | 412 | case CONTEXT_STD: |
414 | return button_context_standard; | 413 | return button_context_standard; |
415 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
416 | case CONTEXT_MAINMENU: | 414 | case CONTEXT_MAINMENU: |
417 | return button_context_tree; | 415 | return button_context_tree; |
418 | case CONTEXT_SETTINGS: | 416 | case CONTEXT_SETTINGS: |
419 | return button_context_settings; | 417 | return button_context_settings; |
420 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
421 | case CONTEXT_WPS: | 418 | case CONTEXT_WPS: |
422 | return button_context_wps; | 419 | return button_context_wps; |
423 | case CONTEXT_YESNOSCREEN: | 420 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-ma.c b/apps/keymaps/keymap-ma.c index 84d8edd7c4..aca006d071 100644 --- a/apps/keymaps/keymap-ma.c +++ b/apps/keymaps/keymap-ma.c | |||
@@ -188,11 +188,10 @@ static const struct button_mapping button_context_yesnoscreen[] = { | |||
188 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 188 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
189 | const struct button_mapping* get_context_mapping(int context) | 189 | const struct button_mapping* get_context_mapping(int context) |
190 | { | 190 | { |
191 | switch (context) | 191 | switch (context & ~CONTEXT_LOCKED) |
192 | { | 192 | { |
193 | /* anything that uses button_context_standard */ | 193 | /* anything that uses button_context_standard */ |
194 | case CONTEXT_LIST: | 194 | case CONTEXT_LIST: |
195 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
196 | case CONTEXT_STD: | 195 | case CONTEXT_STD: |
197 | default: | 196 | default: |
198 | return button_context_standard; | 197 | return button_context_standard; |
@@ -221,14 +220,13 @@ const struct button_mapping* get_context_mapping(int context) | |||
221 | return button_context_settings_r_is_inc; | 220 | return button_context_settings_r_is_inc; |
222 | 221 | ||
223 | case CONTEXT_TREE: | 222 | case CONTEXT_TREE: |
224 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
225 | case CONTEXT_MAINMENU: | 223 | case CONTEXT_MAINMENU: |
226 | if (global_settings.hold_lr_for_scroll_in_list) | 224 | if (global_settings.hold_lr_for_scroll_in_list) |
227 | return button_context_tree_scroll_lr; | 225 | return button_context_tree_scroll_lr; |
228 | /* else fall through to CONTEXT_TREE|CONTEXT_CUSTOM */ | 226 | /* else fall through to CONTEXT_TREE|CONTEXT_CUSTOM */ |
229 | case CONTEXT_TREE|CONTEXT_CUSTOM: | 227 | case CONTEXT_TREE|CONTEXT_CUSTOM: |
230 | return button_context_tree; | 228 | return button_context_tree; |
231 | case CONTEXT_WPS | CONTEXT_LOCKED: | 229 | |
232 | case CONTEXT_WPS: | 230 | case CONTEXT_WPS: |
233 | return button_context_wps; | 231 | return button_context_wps; |
234 | 232 | ||
diff --git a/apps/keymaps/keymap-nwz.c b/apps/keymaps/keymap-nwz.c index 3901645eb2..36675566d3 100644 --- a/apps/keymaps/keymap-nwz.c +++ b/apps/keymaps/keymap-nwz.c | |||
@@ -357,17 +357,14 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | |||
357 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 357 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
358 | const struct button_mapping* get_context_mapping(int context) | 358 | const struct button_mapping* get_context_mapping(int context) |
359 | { | 359 | { |
360 | switch (context) | 360 | switch (context & ~CONTEXT_LOCKED) |
361 | { | 361 | { |
362 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
363 | case CONTEXT_STD: | 362 | case CONTEXT_STD: |
364 | return button_context_standard; | 363 | return button_context_standard; |
365 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
366 | case CONTEXT_MAINMENU: | 364 | case CONTEXT_MAINMENU: |
367 | return button_context_tree; | 365 | return button_context_tree; |
368 | case CONTEXT_SETTINGS: | 366 | case CONTEXT_SETTINGS: |
369 | return button_context_settings; | 367 | return button_context_settings; |
370 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
371 | case CONTEXT_WPS: | 368 | case CONTEXT_WPS: |
372 | return button_context_wps; | 369 | return button_context_wps; |
373 | case CONTEXT_YESNOSCREEN: | 370 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-ondavx777.c b/apps/keymaps/keymap-ondavx777.c index 468ad4b354..c4b68f1ef2 100644 --- a/apps/keymaps/keymap-ondavx777.c +++ b/apps/keymaps/keymap-ondavx777.c | |||
@@ -127,18 +127,15 @@ static const struct button_mapping button_context_usb_hid[] = { | |||
127 | 127 | ||
128 | const struct button_mapping* target_get_context_mapping(int context) | 128 | const struct button_mapping* target_get_context_mapping(int context) |
129 | { | 129 | { |
130 | switch (context) | 130 | switch (context & ~CONTEXT_LOCKED) |
131 | { | 131 | { |
132 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
133 | case CONTEXT_STD: | 132 | case CONTEXT_STD: |
134 | return button_context_standard; | 133 | return button_context_standard; |
135 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
136 | case CONTEXT_WPS: | 134 | case CONTEXT_WPS: |
137 | return button_context_wps; | 135 | return button_context_wps; |
138 | 136 | ||
139 | case CONTEXT_LIST: | 137 | case CONTEXT_LIST: |
140 | return button_context_list; | 138 | return button_context_list; |
141 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
142 | case CONTEXT_MAINMENU: | 139 | case CONTEXT_MAINMENU: |
143 | case CONTEXT_TREE: | 140 | case CONTEXT_TREE: |
144 | if (global_settings.hold_lr_for_scroll_in_list) | 141 | if (global_settings.hold_lr_for_scroll_in_list) |
diff --git a/apps/keymaps/keymap-rk27xx-generic.c b/apps/keymaps/keymap-rk27xx-generic.c index 5be8762af3..4c07384810 100644 --- a/apps/keymaps/keymap-rk27xx-generic.c +++ b/apps/keymaps/keymap-rk27xx-generic.c | |||
@@ -164,12 +164,10 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | |||
164 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 164 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
165 | const struct button_mapping* get_context_mapping(int context) | 165 | const struct button_mapping* get_context_mapping(int context) |
166 | { | 166 | { |
167 | switch (context) | 167 | switch (context & ~CONTEXT_LOCKED) |
168 | { | 168 | { |
169 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
170 | case CONTEXT_STD: | 169 | case CONTEXT_STD: |
171 | return button_context_standard; | 170 | return button_context_standard; |
172 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
173 | case CONTEXT_WPS: | 171 | case CONTEXT_WPS: |
174 | return button_context_wps; | 172 | return button_context_wps; |
175 | #ifdef CONFIG_TUNER | 173 | #ifdef CONFIG_TUNER |
@@ -192,7 +190,6 @@ const struct button_mapping* get_context_mapping(int context) | |||
192 | #endif | 190 | #endif |
193 | case CONTEXT_TREE: | 191 | case CONTEXT_TREE: |
194 | case CONTEXT_LIST: | 192 | case CONTEXT_LIST: |
195 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
196 | case CONTEXT_MAINMENU: | 193 | case CONTEXT_MAINMENU: |
197 | 194 | ||
198 | case CONTEXT_SETTINGS: | 195 | case CONTEXT_SETTINGS: |
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c index 2708266d18..f8fefe5ff3 100644 --- a/apps/keymaps/keymap-shanlingq1.c +++ b/apps/keymaps/keymap-shanlingq1.c | |||
@@ -69,18 +69,15 @@ static const struct button_mapping button_context_yesno[] = { | |||
69 | 69 | ||
70 | const struct button_mapping* target_get_context_mapping(int context) | 70 | const struct button_mapping* target_get_context_mapping(int context) |
71 | { | 71 | { |
72 | switch (context) | 72 | switch (context & ~CONTEXT_LOCKED) |
73 | { | 73 | { |
74 | default: | 74 | default: |
75 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
76 | case CONTEXT_STD: | 75 | case CONTEXT_STD: |
77 | return button_context_standard; | 76 | return button_context_standard; |
78 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
79 | case CONTEXT_WPS: | 77 | case CONTEXT_WPS: |
80 | return button_context_wps; | 78 | return button_context_wps; |
81 | case CONTEXT_TREE: | 79 | case CONTEXT_TREE: |
82 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 80 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
83 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
84 | case CONTEXT_MAINMENU: | 81 | case CONTEXT_MAINMENU: |
85 | case CONTEXT_BOOKMARKSCREEN: | 82 | case CONTEXT_BOOKMARKSCREEN: |
86 | case CONTEXT_LIST: | 83 | case CONTEXT_LIST: |
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 555cf42f79..07710be78d 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -383,7 +383,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
383 | return target_get_context_mapping(context & ~CONTEXT_CUSTOM2); | 383 | return target_get_context_mapping(context & ~CONTEXT_CUSTOM2); |
384 | } | 384 | } |
385 | 385 | ||
386 | switch (context) | 386 | switch (context & ~CONTEXT_LOCKED) |
387 | { | 387 | { |
388 | case CONTEXT_STD: | 388 | case CONTEXT_STD: |
389 | return button_context_standard; | 389 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-xduoox20.c b/apps/keymaps/keymap-xduoox20.c index 04d57949a1..fa4076e27d 100644 --- a/apps/keymaps/keymap-xduoox20.c +++ b/apps/keymaps/keymap-xduoox20.c | |||
@@ -184,11 +184,10 @@ static const struct button_mapping button_context_yesnoscreen[] = { | |||
184 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 184 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
185 | const struct button_mapping* get_context_mapping(int context) | 185 | const struct button_mapping* get_context_mapping(int context) |
186 | { | 186 | { |
187 | switch (context) | 187 | switch (context & ~CONTEXT_LOCKED) |
188 | { | 188 | { |
189 | case CONTEXT_LIST: | 189 | case CONTEXT_LIST: |
190 | return button_context_list; | 190 | return button_context_list; |
191 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
192 | case CONTEXT_STD: | 191 | case CONTEXT_STD: |
193 | return button_context_standard; | 192 | return button_context_standard; |
194 | case CONTEXT_BOOKMARKSCREEN: | 193 | case CONTEXT_BOOKMARKSCREEN: |
@@ -207,10 +206,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
207 | case CONTEXT_SETTINGS_RECTRIGGER: | 206 | case CONTEXT_SETTINGS_RECTRIGGER: |
208 | return button_context_settings_vol_is_inc; | 207 | return button_context_settings_vol_is_inc; |
209 | case CONTEXT_TREE: | 208 | case CONTEXT_TREE: |
210 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
211 | case CONTEXT_MAINMENU: | 209 | case CONTEXT_MAINMENU: |
212 | return button_context_tree; | 210 | return button_context_tree; |
213 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
214 | case CONTEXT_WPS: | 211 | case CONTEXT_WPS: |
215 | return button_context_wps; | 212 | return button_context_wps; |
216 | case CONTEXT_YESNOSCREEN: | 213 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-xduoox3ii.c b/apps/keymaps/keymap-xduoox3ii.c index b25eacd732..c8724ec1f0 100644 --- a/apps/keymaps/keymap-xduoox3ii.c +++ b/apps/keymaps/keymap-xduoox3ii.c | |||
@@ -184,11 +184,10 @@ static const struct button_mapping button_context_yesnoscreen[] = { | |||
184 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 184 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
185 | const struct button_mapping* get_context_mapping(int context) | 185 | const struct button_mapping* get_context_mapping(int context) |
186 | { | 186 | { |
187 | switch (context) | 187 | switch (context & ~CONTEXT_LOCKED) |
188 | { | 188 | { |
189 | case CONTEXT_LIST: | 189 | case CONTEXT_LIST: |
190 | return button_context_list; | 190 | return button_context_list; |
191 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
192 | case CONTEXT_STD: | 191 | case CONTEXT_STD: |
193 | return button_context_standard; | 192 | return button_context_standard; |
194 | case CONTEXT_BOOKMARKSCREEN: | 193 | case CONTEXT_BOOKMARKSCREEN: |
@@ -207,10 +206,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
207 | case CONTEXT_SETTINGS_RECTRIGGER: | 206 | case CONTEXT_SETTINGS_RECTRIGGER: |
208 | return button_context_settings_vol_is_inc; | 207 | return button_context_settings_vol_is_inc; |
209 | case CONTEXT_TREE: | 208 | case CONTEXT_TREE: |
210 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
211 | case CONTEXT_MAINMENU: | 209 | case CONTEXT_MAINMENU: |
212 | return button_context_tree; | 210 | return button_context_tree; |
213 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
214 | case CONTEXT_WPS: | 211 | case CONTEXT_WPS: |
215 | return button_context_wps; | 212 | return button_context_wps; |
216 | case CONTEXT_YESNOSCREEN: | 213 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-ypr0.c b/apps/keymaps/keymap-ypr0.c index e6d3bf8868..6e493ddf61 100644 --- a/apps/keymaps/keymap-ypr0.c +++ b/apps/keymaps/keymap-ypr0.c | |||
@@ -255,18 +255,15 @@ static const struct button_mapping button_context_radio[] = { | |||
255 | 255 | ||
256 | const struct button_mapping* get_context_mapping(int context) | 256 | const struct button_mapping* get_context_mapping(int context) |
257 | { | 257 | { |
258 | switch (context) | 258 | switch (context & ~CONTEXT_LOCKED) |
259 | { | 259 | { |
260 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
261 | case CONTEXT_STD: | 260 | case CONTEXT_STD: |
262 | return button_context_standard; | 261 | return button_context_standard; |
263 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
264 | case CONTEXT_WPS: | 262 | case CONTEXT_WPS: |
265 | return button_context_wps; | 263 | return button_context_wps; |
266 | 264 | ||
267 | case CONTEXT_LIST: | 265 | case CONTEXT_LIST: |
268 | return button_context_list; | 266 | return button_context_list; |
269 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
270 | case CONTEXT_MAINMENU: | 267 | case CONTEXT_MAINMENU: |
271 | return button_context_mainmenu; | 268 | return button_context_mainmenu; |
272 | 269 | ||
diff --git a/apps/keymaps/keymap-ypr1.c b/apps/keymaps/keymap-ypr1.c index 0f991a881d..67f42f07c6 100644 --- a/apps/keymaps/keymap-ypr1.c +++ b/apps/keymaps/keymap-ypr1.c | |||
@@ -132,18 +132,15 @@ static const struct button_mapping button_context_radio[] = { | |||
132 | 132 | ||
133 | const struct button_mapping* target_get_context_mapping(int context) | 133 | const struct button_mapping* target_get_context_mapping(int context) |
134 | { | 134 | { |
135 | switch (context) | 135 | switch (context & ~CONTEXT_LOCKED) |
136 | { | 136 | { |
137 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
138 | case CONTEXT_STD: | 137 | case CONTEXT_STD: |
139 | return button_context_standard; | 138 | return button_context_standard; |
140 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
141 | case CONTEXT_WPS: | 139 | case CONTEXT_WPS: |
142 | return button_context_wps; | 140 | return button_context_wps; |
143 | 141 | ||
144 | case CONTEXT_LIST: | 142 | case CONTEXT_LIST: |
145 | return button_context_list; | 143 | return button_context_list; |
146 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
147 | case CONTEXT_MAINMENU: | 144 | case CONTEXT_MAINMENU: |
148 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 145 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
149 | return button_context_tree; | 146 | return button_context_tree; |
diff --git a/apps/keymaps/keymap-zenxfi2.c b/apps/keymaps/keymap-zenxfi2.c index 43e65ce5d7..ba25592246 100644 --- a/apps/keymaps/keymap-zenxfi2.c +++ b/apps/keymaps/keymap-zenxfi2.c | |||
@@ -137,18 +137,15 @@ static const struct button_mapping button_context_radio[] = { | |||
137 | 137 | ||
138 | const struct button_mapping* target_get_context_mapping(int context) | 138 | const struct button_mapping* target_get_context_mapping(int context) |
139 | { | 139 | { |
140 | switch (context) | 140 | switch (context & ~CONTEXT_LOCKED) |
141 | { | 141 | { |
142 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
143 | case CONTEXT_STD: | 142 | case CONTEXT_STD: |
144 | return button_context_standard; | 143 | return button_context_standard; |
145 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
146 | case CONTEXT_WPS: | 144 | case CONTEXT_WPS: |
147 | return button_context_wps; | 145 | return button_context_wps; |
148 | 146 | ||
149 | case CONTEXT_LIST: | 147 | case CONTEXT_LIST: |
150 | return button_context_list; | 148 | return button_context_list; |
151 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
152 | case CONTEXT_MAINMENU: | 149 | case CONTEXT_MAINMENU: |
153 | case CONTEXT_TREE: | 150 | case CONTEXT_TREE: |
154 | if (global_settings.hold_lr_for_scroll_in_list) | 151 | if (global_settings.hold_lr_for_scroll_in_list) |