mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Seth Forshee <seth.forshee@canonical.com>
To: Corentin Chary <corentin.chary@gmail.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Chris Bagwell <chris@cnpbagwell.com>,
	Matthew Garrett <mjg@redhat.com>,
	acpi4asus-user@lists.sourceforge.net,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 1/3] asus-wmi: Add callback for hotkey filtering
Date: Mon, 28 Mar 2011 13:33:42 -0500	[thread overview]
Message-ID: <1301337224-3293-2-git-send-email-seth.forshee@canonical.com> (raw)
In-Reply-To: <1301337224-3293-1-git-send-email-seth.forshee@canonical.com>

This is required for the T101MT home key, which behaves differently
than other hotkeys.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 drivers/platform/x86/asus-wmi.c |   12 +++++++++++-
 drivers/platform/x86/asus-wmi.h |    6 ++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 5b779a9..b14d992 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -1058,6 +1058,8 @@ static void asus_wmi_notify(u32 value, void *context)
 	acpi_status status;
 	int code;
 	int orig_code;
+	unsigned int key_value = 1;
+	bool autorelease = 1;
 
 	status = wmi_get_event_data(value, &response);
 	if (status != AE_OK) {
@@ -1073,6 +1075,13 @@ static void asus_wmi_notify(u32 value, void *context)
 	code = obj->integer.value;
 	orig_code = code;
 
+	if (asus->driver->key_filter) {
+		asus->driver->key_filter(asus->driver, &code, &key_value,
+					 &autorelease);
+		if (code == ASUS_WMI_KEY_IGNORE)
+			goto exit;
+	}
+
 	if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
 		code = NOTIFY_BRNUP_MIN;
 	else if (code >= NOTIFY_BRNDOWN_MIN &&
@@ -1082,7 +1091,8 @@ static void asus_wmi_notify(u32 value, void *context)
 	if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) {
 		if (!acpi_video_backlight_support())
 			asus_wmi_backlight_notify(asus, orig_code);
-	} else if (!sparse_keymap_report_event(asus->inputdev, code, 1, true))
+	} else if (!sparse_keymap_report_event(asus->inputdev, code,
+					       key_value, autorelease))
 		pr_info("Unknown key %x pressed\n", code);
 
 exit:
diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
index c044522..4da6103 100644
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@ -29,6 +29,8 @@
 
 #include <linux/platform_device.h>
 
+#define ASUS_WMI_KEY_IGNORE (-1)
+
 struct module;
 struct key_entry;
 struct asus_wmi;
@@ -44,6 +46,10 @@ struct asus_wmi_driver {
 	const struct key_entry	*keymap;
 	const char		*input_name;
 	const char		*input_phys;
+	/* Returns new code, value, and autorelease values in arguments.
+	 * Return ASUS_WMI_KEY_IGNORE in code if event should be ignored. */
+	void (*key_filter) (struct asus_wmi_driver *driver, int *code,
+			    unsigned int *value, bool *autorelease);
 
 	int (*probe) (struct platform_device *device);
 	void (*quirks) (struct asus_wmi_driver *driver);
-- 
1.7.4.1


  reply	other threads:[~2011-03-28 18:33 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-23 19:39 [PATCH] eeepc-wmi: Add support for T101MT "Express Gate" key Seth Forshee
2011-03-24  7:33 ` Corentin Chary
2011-03-24 13:14   ` Seth Forshee
2011-03-24 13:26     ` Corentin Chary
2011-03-24 13:27     ` Chris Bagwell
2011-03-24 13:32       ` Chris Bagwell
2011-03-24 13:37       ` Seth Forshee
2011-03-24 13:40       ` Corentin Chary
2011-03-24 14:00         ` Chris Bagwell
2011-03-24 19:57           ` Seth Forshee
2011-03-24 20:03             ` [PATCH 1/2] asus-wmi: Add callback for hotkey filtering Seth Forshee
2011-03-24 20:03             ` [PATCH 2/2] eeepc-wmi: Add support for T101MT Home/Express Gate key Seth Forshee
2011-03-24 20:09               ` Seth Forshee
2011-03-25 13:28               ` Corentin Chary
2011-03-25 13:53                 ` Seth Forshee
2011-03-25 14:05                   ` Corentin Chary
2011-03-25 14:53                     ` Chris Bagwell
2011-03-25 15:13                       ` Seth Forshee
2011-03-25 15:43                       ` Corentin Chary
2011-03-25 16:17                         ` Seth Forshee
2011-03-25 16:14                     ` Dmitry Torokhov
2011-03-25 16:28                       ` Seth Forshee
2011-03-25 17:03                         ` Dmitry Torokhov
2011-03-25 18:58                           ` Seth Forshee
2011-03-27 17:13                             ` Dmitry Torokhov
2011-03-27 18:32                               ` Chris Bagwell
2011-03-27 19:11                                 ` Dmitry Torokhov
2011-03-28 13:46                                   ` Seth Forshee
2011-03-28 14:14                                     ` Corentin Chary
2011-03-28 18:33                                       ` Seth Forshee
2011-03-28 18:33                                         ` Seth Forshee [this message]
2011-03-28 18:33                                         ` [PATCH v3 2/3] " Seth Forshee
2011-03-29 12:29                                           ` Corentin Chary
2011-03-29 13:42                                             ` Seth Forshee
2011-03-29 13:47                                             ` Matthew Garrett
2011-03-30  7:46                                               ` Corentin Chary
2011-03-28 18:33                                         ` [PATCH v3 3/3] asus-wmi: Enable autorepeat for hotkey input device Seth Forshee
2011-03-29  6:33                                         ` [PATCH 2/2] eeepc-wmi: Add support for T101MT Home/Express Gate key Dmitry Torokhov
2011-03-25 16:07           ` [PATCH] eeepc-wmi: Add support for T101MT "Express Gate" key Dmitry Torokhov
2011-03-25 16:08             ` Corentin Chary
2011-03-25 16:05       ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301337224-3293-2-git-send-email-seth.forshee@canonical.com \
    --to=seth.forshee@canonical.com \
    --cc=acpi4asus-user@lists.sourceforge.net \
    --cc=chris@cnpbagwell.com \
    --cc=corentin.chary@gmail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg@redhat.com \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®