platform/x86: intel-vbtn: Support separate press/release events
authorStefan Brüns <stefan.bruens@rwth-aachen.de>
Thu, 9 Nov 2017 22:44:33 +0000 (23:44 +0100)
committerDarren Hart (VMware) <dvhart@infradead.org>
Fri, 8 Dec 2017 21:54:43 +0000 (13:54 -0800)
Currently all key events use autorelease, but this forbids use as a
modifier key.

As all event codes come in even/odd pairs, we can lookup the key type
(KE_KEY/KE_IGNORE) for the key up event corresponding to the currently
handled key down event. If the key up is ignored, we keep setting the
autorelease flag for the key down.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/intel-vbtn.c

index ae55be9..e3f6375 100644 (file)
@@ -76,14 +76,27 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
 {
        struct platform_device *device = context;
        struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
+       const struct key_entry *ke_rel;
+       bool autorelease;
 
        if (priv->wakeup_mode) {
                if (sparse_keymap_entry_from_scancode(priv->input_dev, event)) {
                        pm_wakeup_hard_event(&device->dev);
                        return;
                }
-       } else if (sparse_keymap_report_event(priv->input_dev, event, 1, true)) {
-               return;
+       } else {
+               /* Use the fact press/release come in even/odd pairs */
+               if ((event & 1) && sparse_keymap_report_event(priv->input_dev,
+                                                             event, 0, false))
+                       return;
+
+               ke_rel = sparse_keymap_entry_from_scancode(priv->input_dev,
+                                                          event | 1);
+               autorelease = !ke_rel || ke_rel->type == KE_IGNORE;
+
+               if (sparse_keymap_report_event(priv->input_dev, event, 1,
+                                              autorelease))
+                       return;
        }
        dev_dbg(&device->dev, "unknown event index 0x%x\n", event);
 }