Attachment 613362 Details for Bug 848270 – 0001-acer-wmi-change-to-emit-touchpad-on-off-key.patch

[patch] 0001-acer-wmi-change-to-emit-touchpad-on-off-key.patch

0001-acer-wmi-change-to-emit-touchpad-on-off-key.patch (text/plain), 3.08 KB, created by jlee on 2012-09-16 00:21:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jlee

Created: 2012-09-16 00:21:36 UTC

Size: 3.08 KB

patch

obsolete

>From 9d9a83db5eaf2f7b12ed4ca19202ff34a8b8b46d Mon Sep 17 00:00:00 2001
>From: Lee, Chun-Yi <jlee@suse.com>
>Date: Sun, 16 Sep 2012 07:56:32 +0800
>Subject: [PATCH] acer-wmi: change to emit touchpad on off key
>
>KEY_TOUCHPAD_TOOGLE key is for notice userland change touchpad state
>via xf86-input-synaptics on the machine that don't toggle touchpad in
>hardware. But, acer laptop actually toggle touchpad in hardware.
>So, this patch change to emit KEY_TOUCHPAD_ON/OFF key when acer-wmi grab
>device state of touchpad.
>
>Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
>---
> drivers/platform/x86/acer-wmi.c |   16 ++++++++++++----
> 1 files changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
>index 00d8c39..9d865fb 100644
>--- a/drivers/platform/x86/acer-wmi.c
>+++ b/drivers/platform/x86/acer-wmi.c
>@@ -125,7 +125,9 @@ static const struct key_entry acer_wmi_keymap[] = {
> 	{KE_IGNORE, 0x63, {KEY_BRIGHTNESSDOWN} },
> 	{KE_KEY, 0x64, {KEY_SWITCHVIDEOMODE} },	/* Display Switch */
> 	{KE_IGNORE, 0x81, {KEY_SLEEP} },
>-	{KE_KEY, 0x82, {KEY_TOUCHPAD_TOGGLE} },	/* Touch Pad On/Off */
>+	{KE_KEY, 0x82, {KEY_TOUCHPAD_TOGGLE} },	/* Touch Pad Toggle */
>+	{KE_KEY, KEY_TOUCHPAD_ON, {KEY_TOUCHPAD_ON} },
>+	{KE_KEY, KEY_TOUCHPAD_OFF, {KEY_TOUCHPAD_OFF} },
> 	{KE_IGNORE, 0x83, {KEY_TOUCHPAD_TOGGLE} },
> 	{KE_END, 0}
> };
>@@ -147,6 +149,7 @@ struct event_return_value {
> #define ACER_WMID3_GDS_THREEG		(1<<6)	/* 3G */
> #define ACER_WMID3_GDS_WIMAX		(1<<7)	/* WiMAX */
> #define ACER_WMID3_GDS_BLUETOOTH	(1<<11)	/* BT */
>+#define ACER_WMID3_GDS_TOUCHPAD		(1<<1)	/* Touchpad */
> 
> struct lm_input_params {
> 	u8 function_num;        /* Function Number */
>@@ -1685,6 +1688,7 @@ static void acer_wmi_notify(u32 value, void *context)
> 	acpi_status status;
> 	u16 device_state;
> 	const struct key_entry *key;
>+	u32 scancode;
> 
> 	status = wmi_get_event_data(value, &response);
> 	if (status != AE_OK) {
>@@ -1713,7 +1717,8 @@ static void acer_wmi_notify(u32 value, void *context)
> 	switch (return_value.function) {
> 	case WMID_HOTKEY_EVENT:
> 		device_state = return_value.device_state;
>-		pr_debug("device state: 0x%x\n", device_state);
>+		pr_info("key number: 0x%x\n", return_value.key_num);
>+		pr_info("device state: 0x%x\n", device_state);
> 
> 		key = sparse_keymap_entry_from_scancode(acer_wmi_input_dev,
> 							return_value.key_num);
>@@ -1721,6 +1726,7 @@ static void acer_wmi_notify(u32 value, void *context)
> 			pr_warn("Unknown key number - 0x%x\n",
> 				return_value.key_num);
> 		} else {
>+			scancode = return_value.key_num;
> 			switch (key->keycode) {
> 			case KEY_WLAN:
> 			case KEY_BLUETOOTH:
>@@ -1734,9 +1740,11 @@ static void acer_wmi_notify(u32 value, void *context)
> 					rfkill_set_sw_state(bluetooth_rfkill,
> 						!(device_state & ACER_WMID3_GDS_BLUETOOTH));
> 				break;
>+			case KEY_TOUCHPAD_TOGGLE:
>+				scancode = (device_state & ACER_WMID3_GDS_TOUCHPAD) ?
>+						KEY_TOUCHPAD_ON : KEY_TOUCHPAD_OFF;
> 			}
>-			sparse_keymap_report_entry(acer_wmi_input_dev, key,
>-						   1, true);
>+			sparse_keymap_report_event(acer_wmi_input_dev, scancode, 1, true);
> 		}
> 		break;
> 	case WMID_ACCEL_EVENT:
>-- 
>1.6.0.2
>

Actions: View | Diff

Attachments on bug 848270: 604773 | 604789 | 612620 | 612621 | 613362 | 613366 | 613883