Changeset 4617

Timestamp:

09/01/08 20:09:40 (5 years ago)

Author:

mickey

Message:

neod: Be more relax in keycode used for detecting activity on touch screen.

Different drivers may report different key code. We don't really
need to care which keycode is used, just if there was a key press
at all. So use a range test to look for any 'tool' like button press.

Signed-off-by: NeilBrown? <neilb@…>

File:

• trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c (modified) (3 diffs)

trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c

@@ -50 +50 @@
     #define AUX_BUTTON_KEYCODE 169    /* aux */
     #define POWER_BUTTON_KEYCODE 116  /* power */
-    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+    #define TOUCHSCREEN_BUTTON_KEYCODE_MIN 0x140 /* BTN_DIGI */
+    #define TOUCHSCREEN_BUTTON_KEYCODE_MAX 0x14E /* BTN_TOOL_TRIPLETAP */
 #elif NEOD_PLATFORM_MOTOROLA_EZX
     #define AUX_BUTTON_KEYCODE 0xa7   /* voice */
@@ -67 +68 @@
     #define POWER_BUTTON_KEYCODE 0x23
     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+#endif
+
+#ifndef TOUCHSCREEN_BUTTON_KEYCODE_MIN
+    #define TOUCHSCREEN_BUTTON_KEYCODE_MIN TOUCHSCREEN_BUTTON_KEYCODE
+    #define TOUCHSCREEN_BUTTON_KEYCODE_MAX TOUCHSCREEN_BUTTON_KEYCODE
 #endif
 
@@ -363 +369 @@
             }
             else
-            if ( event.type == 1 && event.code == TOUCHSCREEN_BUTTON_KEYCODE )
+            if ( event.type == 1
+                 && event.code >= TOUCHSCREEN_BUTTON_KEYCODE_MIN
+                 && event.code <= TOUCHSCREEN_BUTTON_KEYCODE_MAX )
             {
                 if ( event.value == 1 ) /* pressed */