Skip to content

L
linux-davinci
Commit 642e0447 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Len Brown
Browse files
Options

eeepc-laptop: switch to using sparse keymap library 

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Tested-by: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Acked-by: default avatarCorentin Chary <corentincj@iksaif.net>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 10ae4b56
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 135 deletions
drivers/platform/x86/Kconfig
View file @ 642e0447
...@@ -364,6 +364,7 @@ config EEEPC_LAPTOP ...@@ -364,6 +364,7 @@ config EEEPC_LAPTOP
select HWMON select HWMON
select LEDS_CLASS select LEDS_CLASS
select NEW_LEDS select NEW_LEDS
select INPUT_SPARSEKMAP
---help--- ---help---
This driver supports the Fn-Fx keys on Eee PC laptops. This driver supports the Fn-Fx keys on Eee PC laptops.
......
drivers/platform/x86/eeepc-laptop.c
View file @ 642e0447
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci_hotplug.h> #include <linux/pci_hotplug.h>
...@@ -121,38 +122,28 @@ static const char *cm_setv[] = { ...@@ -121,38 +122,28 @@ static const char *cm_setv[] = {
NULL, NULL, "PBPS", "TPDS" NULL, NULL, "PBPS", "TPDS"
}; };
struct key_entry {
char type;
u8 code;
u16 keycode;
};
enum { KE_KEY, KE_END };
static const struct key_entry eeepc_keymap[] = { static const struct key_entry eeepc_keymap[] = {
/* Sleep already handled via generic ACPI code */ { KE_KEY, 0x10, { KEY_WLAN } },
{KE_KEY, 0x10, KEY_WLAN }, { KE_KEY, 0x11, { KEY_WLAN } },
{KE_KEY, 0x11, KEY_WLAN }, { KE_KEY, 0x12, { KEY_PROG1 } },
{KE_KEY, 0x12, KEY_PROG1 }, { KE_KEY, 0x13, { KEY_MUTE } },
{KE_KEY, 0x13, KEY_MUTE }, { KE_KEY, 0x14, { KEY_VOLUMEDOWN } },
{KE_KEY, 0x14, KEY_VOLUMEDOWN }, { KE_KEY, 0x15, { KEY_VOLUMEUP } },
{KE_KEY, 0x15, KEY_VOLUMEUP }, { KE_KEY, 0x16, { KEY_DISPLAY_OFF } },
{KE_KEY, 0x16, KEY_DISPLAY_OFF }, { KE_KEY, 0x1a, { KEY_COFFEE } },
{KE_KEY, 0x1a, KEY_COFFEE }, { KE_KEY, 0x1b, { KEY_ZOOM } },
{KE_KEY, 0x1b, KEY_ZOOM }, { KE_KEY, 0x1c, { KEY_PROG2 } },
{KE_KEY, 0x1c, KEY_PROG2 }, { KE_KEY, 0x1d, { KEY_PROG3 } },
{KE_KEY, 0x1d, KEY_PROG3 }, { KE_KEY, NOTIFY_BRN_MIN, { KEY_BRIGHTNESSDOWN } },
{KE_KEY, NOTIFY_BRN_MIN, KEY_BRIGHTNESSDOWN }, { KE_KEY, NOTIFY_BRN_MAX, { KEY_BRIGHTNESSUP } },
{KE_KEY, NOTIFY_BRN_MAX, KEY_BRIGHTNESSUP }, { KE_KEY, 0x30, { KEY_SWITCHVIDEOMODE } },
{KE_KEY, 0x30, KEY_SWITCHVIDEOMODE }, { KE_KEY, 0x31, { KEY_SWITCHVIDEOMODE } },
{KE_KEY, 0x31, KEY_SWITCHVIDEOMODE }, { KE_KEY, 0x32, { KEY_SWITCHVIDEOMODE } },
{KE_KEY, 0x32, KEY_SWITCHVIDEOMODE }, { KE_KEY, 0x37, { KEY_F13 } }, /* Disable Touchpad */
{KE_KEY, 0x37, KEY_F13 }, /* Disable Touchpad */ { KE_KEY, 0x38, { KEY_F14 } },
{KE_KEY, 0x38, KEY_F14 }, { KE_END, 0 },
{KE_END, 0},
}; };
/* /*
* This is the main structure, we can use it to store useful information * This is the main structure, we can use it to store useful information
*/ */
...@@ -1143,120 +1134,42 @@ static void eeepc_backlight_exit(struct eeepc_laptop *eeepc) ...@@ -1143,120 +1134,42 @@ static void eeepc_backlight_exit(struct eeepc_laptop *eeepc)
/* /*
* Input device (i.e. hotkeys) * Input device (i.e. hotkeys)
*/ */
static struct key_entry *eeepc_get_entry_by_scancode( static int eeepc_input_init(struct eeepc_laptop *eeepc)
struct eeepc_laptop *eeepc,
int code)
{ {
struct key_entry *key; struct input_dev *input;
int error;
for (key = eeepc->keymap; key->type != KE_END; key++)
if (code == key->code)
return key;
return NULL; input = input_allocate_device();
} if (!input) {
pr_info("Unable to allocate input device\n");
static void eeepc_input_notify(struct eeepc_laptop *eeepc, int event) return -ENOMEM;
{
static struct key_entry *key;
key = eeepc_get_entry_by_scancode(eeepc, event);
if (key) {
switch (key->type) {
case KE_KEY:
input_report_key(eeepc->inputdev, key->keycode,
1);
input_sync(eeepc->inputdev);
input_report_key(eeepc->inputdev, key->keycode,
0);
input_sync(eeepc->inputdev);
break;
}
} }
}
static struct key_entry *eeepc_get_entry_by_keycode(
struct eeepc_laptop *eeepc, int code)
{
struct key_entry *key;
for (key = eeepc->keymap; key->type != KE_END; key++)
if (code == key->keycode && key->type == KE_KEY)
return key;
return NULL; input->name = "Asus EeePC extra buttons";
} input->phys = EEEPC_LAPTOP_FILE "/input0";
input->id.bustype = BUS_HOST;
input->dev.parent = &eeepc->platform_device->dev;
static int eeepc_getkeycode(struct input_dev *dev, int scancode, int *keycode) error = sparse_keymap_setup(input, eeepc_keymap, NULL);
{ if (error) {
struct eeepc_laptop *eeepc = input_get_drvdata(dev); pr_err("Unable to setup input device keymap\n");
struct key_entry *key = eeepc_get_entry_by_scancode(eeepc, scancode); goto err_free_dev;
if (key && key->type == KE_KEY) {
*keycode = key->keycode;
return 0;
} }
return -EINVAL; error = input_register_device(input);
} if (error) {
pr_err("Unable to register input device\n");
static int eeepc_setkeycode(struct input_dev *dev, int scancode, int keycode) goto err_free_keymap;
{
struct eeepc_laptop *eeepc = input_get_drvdata(dev);
struct key_entry *key;
int old_keycode;
if (keycode < 0 || keycode > KEY_MAX)
return -EINVAL;
key = eeepc_get_entry_by_scancode(eeepc, scancode);
if (key && key->type == KE_KEY) {
old_keycode = key->keycode;
key->keycode = keycode;
set_bit(keycode, dev->keybit);
if (!eeepc_get_entry_by_keycode(eeepc, old_keycode))
clear_bit(old_keycode, dev->keybit);
return 0;
} }
return -EINVAL; eeepc->inputdev = input;
}
static int eeepc_input_init(struct eeepc_laptop *eeepc)
{
const struct key_entry *key;
int result;
eeepc->inputdev = input_allocate_device();
if (!eeepc->inputdev) {
pr_info("Unable to allocate input device\n");
return -ENOMEM;
}
eeepc->inputdev->name = "Asus EeePC extra buttons";
eeepc->inputdev->dev.parent = &eeepc->platform_device->dev;
eeepc->inputdev->phys = EEEPC_LAPTOP_FILE "/input0";
eeepc->inputdev->id.bustype = BUS_HOST;
eeepc->inputdev->getkeycode = eeepc_getkeycode;
eeepc->inputdev->setkeycode = eeepc_setkeycode;
input_set_drvdata(eeepc->inputdev, eeepc);
eeepc->keymap = kmemdup(eeepc_keymap, sizeof(eeepc_keymap),
GFP_KERNEL);
for (key = eeepc_keymap; key->type != KE_END; key++) {
switch (key->type) {
case KE_KEY:
set_bit(EV_KEY, eeepc->inputdev->evbit);
set_bit(key->keycode, eeepc->inputdev->keybit);
break;
}
}
result = input_register_device(eeepc->inputdev);
if (result) {
pr_info("Unable to register input device\n");
input_free_device(eeepc->inputdev);
return result;
}
return 0; return 0;
err_free_keymap:
sparse_keymap_free(input);
err_free_dev:
input_free_device(input);
return error;
} }
static void eeepc_input_exit(struct eeepc_laptop *eeepc) static void eeepc_input_exit(struct eeepc_laptop *eeepc)
...@@ -1306,11 +1219,12 @@ static void eeepc_acpi_notify(struct acpi_device *device, u32 event) ...@@ -1306,11 +1219,12 @@ static void eeepc_acpi_notify(struct acpi_device *device, u32 event)
* event will be desired value (or else ignored) * event will be desired value (or else ignored)
*/ */
} }
eeepc_input_notify(eeepc, event); sparse_keymap_report_event(eeepc->inputdev, event,
1, true);
} }
} else { } else {
/* Everything else is a bona-fide keypress event */ /* Everything else is a bona-fide keypress event */
eeepc_input_notify(eeepc, event); sparse_keymap_report_event(eeepc->inputdev, event, 1, true);
} }
} }
...@@ -1554,10 +1468,12 @@ static int __init eeepc_laptop_init(void) ...@@ -1554,10 +1468,12 @@ static int __init eeepc_laptop_init(void)
result = acpi_bus_register_driver(&eeepc_acpi_driver); result = acpi_bus_register_driver(&eeepc_acpi_driver);
if (result < 0) if (result < 0)
goto fail_acpi_driver; goto fail_acpi_driver;
if (!eeepc_device_present) { if (!eeepc_device_present) {
result = -ENODEV; result = -ENODEV;
goto fail_no_device; goto fail_no_device;
} }
return 0; return 0;
fail_no_device: fail_no_device:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment