toshiba_acpi: Add full hotkey support

Commit Message

Andrey Borzenkov March 6, 2009, 6:37 p.m. UTC

Matthew Garrett wrote:

> Calling the ENAB method on Toshiba laptops results in notifications
> being sent when laptop hotkeys are pressed. This patch simply calls that
> method and sets up an input device if it's successful.
>     
> Signed-off-by: Matthew Garrett <[e-mail]>
> 

Works on my Toshiba Portege 4000. I tried to enable it directly in keyboard  controller using 
information from Toshiba Linux pages but it failed. Thank you!

Tested-by: Andrey Borzenkov <[e-mail]>

Trivial cleanup below. Also the patch should remove /proc/acpi/toshiba/keys. It will consume hot keys 
as soon as they are pressed, so user space watching this file has very little chances to ever see 
them.

---

Subject: [PATCH] Trivial fixes to enable Toshiba keyboard patch
From: Andrey Borzenkov <[e-mail]>

Fix type of third parameter of toshiba_acpi_notify.
Remove extraneous white space in function invocation.

Signed-off-by: Andrey Borzenkov <[e-mail]>

---

 drivers/platform/x86/toshiba_acpi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Matthew Garrett March 6, 2009, 6:44 p.m. UTC | #1

On Fri, Mar 06, 2009 at 09:37:50PM +0300, Andrey Borzenkov wrote:

> Trivial cleanup below. Also the patch should remove /proc/acpi/toshiba/keys. It will consume hot keys 
> as soon as they are pressed, so user space watching this file has very little chances to ever see 
> them.

Mm. Actually, thinking about it, the cleanest thing to do would probably 
be to disable the input device when the proc file is opened.

Andrey Borzenkov March 6, 2009, 6:57 p.m. UTC | #2

On 6 марта 2009 21:44:52 Matthew Garrett wrote:
> On Fri, Mar 06, 2009 at 09:37:50PM +0300, Andrey Borzenkov wrote:
> > Trivial cleanup below. Also the patch should remove
> > /proc/acpi/toshiba/keys. It will consume hot keys as soon as they
> > are pressed, so user space watching this file has very little
> > chances to ever see them.
>
> Mm. Actually, thinking about it, the cleanest thing to do would
> probably be to disable the input device when the proc file is opened.

C'mon, really. Let's make it depend on _DEPRECATED and obsolete in 
2.6.31. Who needs this now?

Patch

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 604f9fa..c334007 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -793,7 +793,7 @@  static int toshiba_acpi_setkeycode(struct input_dev *dev, int scancode,
 	return -EINVAL;
 }
 
-static void toshiba_acpi_notify(acpi_handle handle, u32 event, void **data)
+static void toshiba_acpi_notify(acpi_handle handle, u32 event, void *data)
 {
 	u32 hci_result, value;
 	struct key_entry *key;
@@ -851,7 +851,7 @@  static int toshiba_acpi_setup_keyboard(char *device)
 		return -ENODEV;
 	}
 
-	status = acpi_install_notify_handler (handle, ACPI_DEVICE_NOTIFY,
+	status = acpi_install_notify_handler(handle, ACPI_DEVICE_NOTIFY,
 					      toshiba_acpi_notify, NULL);
 	if (ACPI_FAILURE(status)) {
 		printk(MY_INFO "Unable to install hotkey notification\n");