summaryrefslogtreecommitdiff
path: root/apps/keymaps/keymap-touchscreen.c
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2009-02-26 22:05:34 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2009-02-26 22:05:34 +0000
commitdfd32efc639400dbe4f6d63f6de64edde6f4da36 (patch)
treea932bf6b3cfdffd8d61c4d5bf87ff002b58f089c /apps/keymaps/keymap-touchscreen.c
parent5e058e0bfe9f575d56f8907bf4bc96ac4e315dcb (diff)
downloadrockbox-dfd32efc639400dbe4f6d63f6de64edde6f4da36.zip
rockbox-dfd32efc639400dbe4f6d63f6de64edde6f4da36.tar.gz
rockbox-dfd32efc639400dbe4f6d63f6de64edde6f4da36.tar.bz2
rockbox-dfd32efc639400dbe4f6d63f6de64edde6f4da36.tar.xz
Onda VX747: redo keymap (which fixes the not-working emulated touchscreen buttons). Also make check for & CONTEXT_REMOTE conditional in keymap-touchscreen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20120 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-touchscreen.c')
-rw-r--r--apps/keymaps/keymap-touchscreen.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index 5392431..4b31ac6 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -224,8 +224,12 @@ static const struct button_mapping button_context_keyboard[] = {
const struct button_mapping* get_context_mapping(int context)
{
- if ((context&CONTEXT_REMOTE) || (context&CONTEXT_CUSTOM2))
- return target_get_context_mapping(context&(~CONTEXT_CUSTOM2));
+ if (context & CONTEXT_CUSTOM2
+#if BUTTON_REMOTE != 0
+ || context & CONTEXT_REMOTE
+#endif
+ )
+ return target_get_context_mapping(context & ~CONTEXT_CUSTOM2);
switch (context)
{