Skip to content

L
linux
Commit 4aa49eb2 authored by Stelian Pop's avatar Stelian Pop Committed by Linus Torvalds
Browse files
Options

[PATCH] sonypi: rework input support 

 * feed most of special keys through the input subsystem
 * initialize two separate input devices: a mouse like one for
   the jogdial and a keyboard like one for the special keys
 * add support for SONYPI_EVENT_FNKEY_RELEASED

Many people participated in a way or another to this patch, 
including Daniel K. <daniel@cluded.net>, Bastien Nocera <hadess@hadess.net>,
Dmitry Torokhov <dtor@mail.ru> and Vojtech Pavlik <vojtech@suse.cz>.
Signed-off-by: default avatarStelian Pop <stelian@popies.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d394ccce
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 49 deletions
drivers/char/sonypi.c
View file @ 4aa49eb2
...@@ -309,6 +309,27 @@ static void sonypi_setbluetoothpower(u8 state) { ...@@ -309,6 +309,27 @@ static void sonypi_setbluetoothpower(u8 state) {
sonypi_device.bluetooth_power = state; sonypi_device.bluetooth_power = state;
} }
static void input_keyrelease(void *data)
{
struct input_dev *input_dev;
int key;
while (1) {
if (kfifo_get(sonypi_device.input_fifo,
(unsigned char *)&input_dev,
sizeof(input_dev)) != sizeof(input_dev))
return;
if (kfifo_get(sonypi_device.input_fifo,
(unsigned char *)&key,
sizeof(key)) != sizeof(key))
return;
msleep(10);
input_report_key(input_dev, key, 0);
input_sync(input_dev);
}
}
/* Interrupt handler: some event is available */ /* Interrupt handler: some event is available */
static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) { static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
u8 v1, v2, event = 0; u8 v1, v2, event = 0;
...@@ -345,22 +366,51 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) { ...@@ -345,22 +366,51 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
printk(KERN_INFO printk(KERN_INFO
"sonypi: event port1=0x%02x,port2=0x%02x\n", v1, v2); "sonypi: event port1=0x%02x,port2=0x%02x\n", v1, v2);
#ifdef SONYPI_USE_INPUT
if (useinput) { if (useinput) {
struct input_dev *jog_dev = &sonypi_device.jog_dev; struct input_dev *input_jog_dev = &sonypi_device.input_jog_dev;
if (event == SONYPI_EVENT_JOGDIAL_PRESSED) struct input_dev *input_key_dev = &sonypi_device.input_key_dev;
input_report_key(jog_dev, BTN_MIDDLE, 1); switch (event) {
else if (event == SONYPI_EVENT_ANYBUTTON_RELEASED) case SONYPI_EVENT_JOGDIAL_UP:
input_report_key(jog_dev, BTN_MIDDLE, 0); case SONYPI_EVENT_JOGDIAL_UP_PRESSED:
else if ((event == SONYPI_EVENT_JOGDIAL_UP) || input_report_rel(input_jog_dev, REL_WHEEL, 1);
(event == SONYPI_EVENT_JOGDIAL_UP_PRESSED)) break;
input_report_rel(jog_dev, REL_WHEEL, 1); case SONYPI_EVENT_JOGDIAL_DOWN:
else if ((event == SONYPI_EVENT_JOGDIAL_DOWN) || case SONYPI_EVENT_JOGDIAL_DOWN_PRESSED:
(event == SONYPI_EVENT_JOGDIAL_DOWN_PRESSED)) input_report_rel(input_jog_dev, REL_WHEEL, -1);
input_report_rel(jog_dev, REL_WHEEL, -1); break;
input_sync(jog_dev); case SONYPI_EVENT_JOGDIAL_PRESSED: {
int key = BTN_MIDDLE;
input_report_key(input_jog_dev, key, 1);
kfifo_put(sonypi_device.input_fifo,
(unsigned char *)&input_jog_dev,
sizeof(input_jog_dev));
kfifo_put(sonypi_device.input_fifo,
(unsigned char *)&key, sizeof(key));
break;
}
case SONYPI_EVENT_FNKEY_RELEASED:
/* Nothing, not all VAIOs generate this event */
break;
}
input_sync(input_jog_dev);
for (i = 0; sonypi_inputkeys[i].sonypiev; i++) {
int key;
if (event != sonypi_inputkeys[i].sonypiev)
continue;
key = sonypi_inputkeys[i].inputev;
input_report_key(input_key_dev, key, 1);
kfifo_put(sonypi_device.input_fifo,
(unsigned char *)&input_key_dev,
sizeof(input_key_dev));
kfifo_put(sonypi_device.input_fifo,
(unsigned char *)&key, sizeof(key));
}
input_sync(input_key_dev);
schedule_work(&sonypi_device.input_work);
} }
#endif /* SONYPI_USE_INPUT */
kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event)); kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event));
kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN); kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN);
...@@ -764,6 +814,62 @@ static int __devinit sonypi_probe(void) ...@@ -764,6 +814,62 @@ static int __devinit sonypi_probe(void)
goto out3; goto out3;
} }
if (useinput) {
/* Initialize the Input Drivers: jogdial */
int i;
sonypi_device.input_jog_dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
sonypi_device.input_jog_dev.keybit[LONG(BTN_MOUSE)] =
BIT(BTN_MIDDLE);
sonypi_device.input_jog_dev.relbit[0] = BIT(REL_WHEEL);
sonypi_device.input_jog_dev.name =
(char *) kmalloc(sizeof(SONYPI_JOG_INPUTNAME), GFP_KERNEL);
if (!sonypi_device.input_jog_dev.name) {
printk(KERN_ERR "sonypi: kmalloc failed\n");
ret = -ENOMEM;
goto out_inkmallocinput1;
}
sprintf(sonypi_device.input_jog_dev.name, SONYPI_JOG_INPUTNAME);
sonypi_device.input_jog_dev.id.bustype = BUS_ISA;
sonypi_device.input_jog_dev.id.vendor = PCI_VENDOR_ID_SONY;
input_register_device(&sonypi_device.input_jog_dev);
printk(KERN_INFO "%s input method installed.\n",
sonypi_device.input_jog_dev.name);
/* Initialize the Input Drivers: special keys */
sonypi_device.input_key_dev.evbit[0] = BIT(EV_KEY);
for (i = 0; sonypi_inputkeys[i].sonypiev; i++)
if (sonypi_inputkeys[i].inputev)
set_bit(sonypi_inputkeys[i].inputev,
sonypi_device.input_key_dev.keybit);
sonypi_device.input_key_dev.name =
(char *) kmalloc(sizeof(SONYPI_KEY_INPUTNAME), GFP_KERNEL);
if (!sonypi_device.input_key_dev.name) {
printk(KERN_ERR "sonypi: kmalloc failed\n");
ret = -ENOMEM;
goto out_inkmallocinput2;
}
sprintf(sonypi_device.input_key_dev.name, SONYPI_KEY_INPUTNAME);
sonypi_device.input_key_dev.id.bustype = BUS_ISA;
sonypi_device.input_key_dev.id.vendor = PCI_VENDOR_ID_SONY;
input_register_device(&sonypi_device.input_key_dev);
printk(KERN_INFO "%s input method installed.\n",
sonypi_device.input_key_dev.name);
sonypi_device.input_fifo_lock = SPIN_LOCK_UNLOCKED;
sonypi_device.input_fifo =
kfifo_alloc(SONYPI_BUF_SIZE, GFP_KERNEL,
&sonypi_device.input_fifo_lock);
if (IS_ERR(sonypi_device.input_fifo)) {
printk(KERN_ERR "sonypi: kfifo_alloc failed\n");
ret = PTR_ERR(sonypi_device.input_fifo);
goto out_infifo;
}
INIT_WORK(&sonypi_device.input_work, input_keyrelease, NULL);
}
sonypi_device.pdev = platform_device_register_simple("sonypi", -1, sonypi_device.pdev = platform_device_register_simple("sonypi", -1,
NULL, 0); NULL, 0);
if (IS_ERR(sonypi_device.pdev)) { if (IS_ERR(sonypi_device.pdev)) {
...@@ -795,26 +901,18 @@ static int __devinit sonypi_probe(void) ...@@ -795,26 +901,18 @@ static int __devinit sonypi_probe(void)
printk(KERN_INFO "sonypi: device allocated minor is %d\n", printk(KERN_INFO "sonypi: device allocated minor is %d\n",
sonypi_misc_device.minor); sonypi_misc_device.minor);
#ifdef SONYPI_USE_INPUT
if (useinput) {
/* Initialize the Input Drivers: */
sonypi_device.jog_dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
sonypi_device.jog_dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_MIDDLE);
sonypi_device.jog_dev.relbit[0] = BIT(REL_WHEEL);
sonypi_device.jog_dev.name = (char *) kmalloc(
sizeof(SONYPI_INPUTNAME), GFP_KERNEL);
sprintf(sonypi_device.jog_dev.name, SONYPI_INPUTNAME);
sonypi_device.jog_dev.id.bustype = BUS_ISA;
sonypi_device.jog_dev.id.vendor = PCI_VENDOR_ID_SONY;
input_register_device(&sonypi_device.jog_dev);
printk(KERN_INFO "%s installed.\n", sonypi_device.jog_dev.name);
}
#endif /* SONYPI_USE_INPUT */
return 0; return 0;
out_platformdev: out_platformdev:
kfifo_free(sonypi_device.input_fifo);
out_infifo:
input_unregister_device(&sonypi_device.input_key_dev);
kfree(sonypi_device.input_key_dev.name);
out_inkmallocinput2:
input_unregister_device(&sonypi_device.input_jog_dev);
kfree(sonypi_device.input_jog_dev.name);
out_inkmallocinput1:
free_irq(sonypi_device.irq, sonypi_irq);
out3: out3:
release_region(sonypi_device.ioport1, sonypi_device.region_size); release_region(sonypi_device.ioport1, sonypi_device.region_size);
out2: out2:
...@@ -832,12 +930,13 @@ static void __devexit sonypi_remove(void) ...@@ -832,12 +930,13 @@ static void __devexit sonypi_remove(void)
platform_device_unregister(sonypi_device.pdev); platform_device_unregister(sonypi_device.pdev);
#ifdef SONYPI_USE_INPUT
if (useinput) { if (useinput) {
input_unregister_device(&sonypi_device.jog_dev); input_unregister_device(&sonypi_device.input_key_dev);
kfree(sonypi_device.jog_dev.name); kfree(sonypi_device.input_key_dev.name);
input_unregister_device(&sonypi_device.input_jog_dev);
kfree(sonypi_device.input_jog_dev.name);
kfifo_free(sonypi_device.input_fifo);
} }
#endif /* SONYPI_USE_INPUT */
free_irq(sonypi_device.irq, sonypi_irq); free_irq(sonypi_device.irq, sonypi_irq);
release_region(sonypi_device.ioport1, sonypi_device.region_size); release_region(sonypi_device.ioport1, sonypi_device.region_size);
......
drivers/char/sonypi.h
View file @ 4aa49eb2
...@@ -222,6 +222,7 @@ static struct sonypi_event sonypi_fnkeyev[] = { ...@@ -222,6 +222,7 @@ static struct sonypi_event sonypi_fnkeyev[] = {
{ 0x1a, SONYPI_EVENT_FNKEY_F10 }, { 0x1a, SONYPI_EVENT_FNKEY_F10 },
{ 0x1b, SONYPI_EVENT_FNKEY_F11 }, { 0x1b, SONYPI_EVENT_FNKEY_F11 },
{ 0x1c, SONYPI_EVENT_FNKEY_F12 }, { 0x1c, SONYPI_EVENT_FNKEY_F12 },
{ 0x1f, SONYPI_EVENT_FNKEY_RELEASED },
{ 0x21, SONYPI_EVENT_FNKEY_1 }, { 0x21, SONYPI_EVENT_FNKEY_1 },
{ 0x22, SONYPI_EVENT_FNKEY_2 }, { 0x22, SONYPI_EVENT_FNKEY_2 },
{ 0x31, SONYPI_EVENT_FNKEY_D }, { 0x31, SONYPI_EVENT_FNKEY_D },
...@@ -340,17 +341,48 @@ struct sonypi_eventtypes { ...@@ -340,17 +341,48 @@ struct sonypi_eventtypes {
#define SONYPI_BUF_SIZE 128 #define SONYPI_BUF_SIZE 128
/* We enable input subsystem event forwarding if the input /* The name of the devices for the input device drivers */
* subsystem is compiled in, but only if sonypi is not into the #define SONYPI_JOG_INPUTNAME "Sony Vaio Jogdial"
* kernel and input as a module... */ #define SONYPI_KEY_INPUTNAME "Sony Vaio Keys"
#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
#if ! (defined(CONFIG_SONYPI) && defined(CONFIG_INPUT_MODULE)) /* Correspondance table between sonypi events and input layer events */
#define SONYPI_USE_INPUT struct {
#endif int sonypiev;
#endif int inputev;
} sonypi_inputkeys[] = {
/* The name of the Jog Dial for the input device drivers */ { SONYPI_EVENT_CAPTURE_PRESSED, KEY_CAMERA },
#define SONYPI_INPUTNAME "Sony VAIO Jog Dial" { SONYPI_EVENT_FNKEY_ONLY, KEY_FN },
{ SONYPI_EVENT_FNKEY_ESC, KEY_FN_ESC },
{ SONYPI_EVENT_FNKEY_F1, KEY_FN_F1 },
{ SONYPI_EVENT_FNKEY_F2, KEY_FN_F2 },
{ SONYPI_EVENT_FNKEY_F3, KEY_FN_F3 },
{ SONYPI_EVENT_FNKEY_F4, KEY_FN_F4 },
{ SONYPI_EVENT_FNKEY_F5, KEY_FN_F5 },
{ SONYPI_EVENT_FNKEY_F6, KEY_FN_F6 },
{ SONYPI_EVENT_FNKEY_F7, KEY_FN_F7 },
{ SONYPI_EVENT_FNKEY_F8, KEY_FN_F8 },
{ SONYPI_EVENT_FNKEY_F9, KEY_FN_F9 },
{ SONYPI_EVENT_FNKEY_F10, KEY_FN_F10 },
{ SONYPI_EVENT_FNKEY_F11, KEY_FN_F11 },
{ SONYPI_EVENT_FNKEY_F12, KEY_FN_F12 },
{ SONYPI_EVENT_FNKEY_1, KEY_FN_1 },
{ SONYPI_EVENT_FNKEY_2, KEY_FN_2 },
{ SONYPI_EVENT_FNKEY_D, KEY_FN_D },
{ SONYPI_EVENT_FNKEY_E, KEY_FN_E },
{ SONYPI_EVENT_FNKEY_F, KEY_FN_F },
{ SONYPI_EVENT_FNKEY_S, KEY_FN_S },
{ SONYPI_EVENT_FNKEY_B, KEY_FN_B },
{ SONYPI_EVENT_BLUETOOTH_PRESSED, KEY_BLUE },
{ SONYPI_EVENT_BLUETOOTH_ON, KEY_BLUE },
{ SONYPI_EVENT_PKEY_P1, KEY_PROG1 },
{ SONYPI_EVENT_PKEY_P2, KEY_PROG2 },
{ SONYPI_EVENT_PKEY_P3, KEY_PROG3 },
{ SONYPI_EVENT_BACK_PRESSED, KEY_BACK },
{ SONYPI_EVENT_HELP_PRESSED, KEY_HELP },
{ SONYPI_EVENT_ZOOM_PRESSED, KEY_ZOOM },
{ SONYPI_EVENT_THUMBPHRASE_PRESSED, BTN_THUMB },
{ 0, 0 },
};
struct sonypi_device { struct sonypi_device {
struct pci_dev *dev; struct pci_dev *dev;
...@@ -370,9 +402,11 @@ struct sonypi_device { ...@@ -370,9 +402,11 @@ struct sonypi_device {
struct fasync_struct *fifo_async; struct fasync_struct *fifo_async;
int open_count; int open_count;
int model; int model;
#ifdef SONYPI_USE_INPUT struct input_dev input_jog_dev;
struct input_dev jog_dev; struct input_dev input_key_dev;
#endif struct work_struct input_work;
struct kfifo *input_fifo;
spinlock_t input_fifo_lock;
}; };
#define ITERATIONS_LONG 10000 #define ITERATIONS_LONG 10000
......
include/linux/input.h
View file @ 4aa49eb2
...@@ -473,6 +473,28 @@ struct input_absinfo { ...@@ -473,6 +473,28 @@ struct input_absinfo {
#define KEY_INS_LINE 0x1c2 #define KEY_INS_LINE 0x1c2
#define KEY_DEL_LINE 0x1c3 #define KEY_DEL_LINE 0x1c3
#define KEY_FN 0x1d0
#define KEY_FN_ESC 0x1d1
#define KEY_FN_F1 0x1d2
#define KEY_FN_F2 0x1d3
#define KEY_FN_F3 0x1d4
#define KEY_FN_F4 0x1d5
#define KEY_FN_F5 0x1d6
#define KEY_FN_F6 0x1d7
#define KEY_FN_F7 0x1d8
#define KEY_FN_F8 0x1d9
#define KEY_FN_F9 0x1da
#define KEY_FN_F10 0x1db
#define KEY_FN_F11 0x1dc
#define KEY_FN_F12 0x1dd
#define KEY_FN_1 0x1de
#define KEY_FN_2 0x1df
#define KEY_FN_D 0x1e0
#define KEY_FN_E 0x1e1
#define KEY_FN_F 0x1e2
#define KEY_FN_S 0x1e3
#define KEY_FN_B 0x1e4
#define KEY_MAX 0x1ff #define KEY_MAX 0x1ff
/* /*
......
include/linux/sonypi.h
View file @ 4aa49eb2
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
#define SONYPI_EVENT_ANYBUTTON_RELEASED 56 #define SONYPI_EVENT_ANYBUTTON_RELEASED 56
#define SONYPI_EVENT_BATTERY_INSERT 57 #define SONYPI_EVENT_BATTERY_INSERT 57
#define SONYPI_EVENT_BATTERY_REMOVE 58 #define SONYPI_EVENT_BATTERY_REMOVE 58
#define SONYPI_EVENT_FNKEY_RELEASED 59
/* get/set brightness */ /* get/set brightness */
#define SONYPI_IOCGBRT _IOR('v', 0, __u8) #define SONYPI_IOCGBRT _IOR('v', 0, __u8)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7