mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290 Input: ALPS - put secondary device in proper place in sysfs Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WX Input: document i8042.noloop Input: add keyboard notifier documentation Input: ads7846 - fix uninitialized var warning Input: i8042 - add SNI RM support Input: i8042 - add Lenovo 3000 N100 to nomux blacklist Input: i8042 - fix warning on non-x86 builds Input: cobalt_btns - assorted fixes
This commit is contained in:
commit
fb00f7629b
13 changed files with 183 additions and 25 deletions
52
Documentation/input/notifier.txt
Normal file
52
Documentation/input/notifier.txt
Normal file
|
@ -0,0 +1,52 @@
|
|||
Keyboard notifier
|
||||
|
||||
One can use register_keyboard_notifier to get called back on keyboard
|
||||
events (see kbd_keycode() function for details). The passed structure is
|
||||
keyboard_notifier_param:
|
||||
|
||||
- 'vc' always provide the VC for which the keyboard event applies;
|
||||
- 'down' is 1 for a key press event, 0 for a key release;
|
||||
- 'shift' is the current modifier state, mask bit indexes are KG_*;
|
||||
- 'value' depends on the type of event.
|
||||
|
||||
- KBD_KEYCODE events are always sent before other events, value is the keycode.
|
||||
- KBD_UNBOUND_KEYCODE events are sent if the keycode is not bound to a keysym.
|
||||
value is the keycode.
|
||||
- KBD_UNICODE events are sent if the keycode -> keysym translation produced a
|
||||
unicode character. value is the unicode value.
|
||||
- KBD_KEYSYM events are sent if the keycode -> keysym translation produced a
|
||||
non-unicode character. value is the keysym.
|
||||
- KBD_POST_KEYSYM events are sent after the treatment of non-unicode keysyms.
|
||||
That permits one to inspect the resulting LEDs for instance.
|
||||
|
||||
For each kind of event but the last, the callback may return NOTIFY_STOP in
|
||||
order to "eat" the event: the notify loop is stopped and the keyboard event is
|
||||
dropped.
|
||||
|
||||
In a rough C snippet, we have:
|
||||
|
||||
kbd_keycode(keycode) {
|
||||
...
|
||||
params.value = keycode;
|
||||
if (notifier_call_chain(KBD_KEYCODE,¶ms) == NOTIFY_STOP)
|
||||
|| !bound) {
|
||||
notifier_call_chain(KBD_UNBOUND_KEYCODE,¶ms);
|
||||
return;
|
||||
}
|
||||
|
||||
if (unicode) {
|
||||
param.value = unicode;
|
||||
if (notifier_call_chain(KBD_UNICODE,¶ms) == NOTIFY_STOP)
|
||||
return;
|
||||
emit unicode;
|
||||
return;
|
||||
}
|
||||
|
||||
params.value = keysym;
|
||||
if (notifier_call_chain(KBD_KEYSYM,¶ms) == NOTIFY_STOP)
|
||||
return;
|
||||
apply keysym;
|
||||
notifier_call_chain(KBD_POST_KEYSYM,¶ms);
|
||||
}
|
||||
|
||||
NOTE: This notifier is usually called from interrupt context.
|
|
@ -732,6 +732,8 @@ and is between 256 and 4096 characters. It is defined in the file
|
|||
(Don't attempt to blink the leds)
|
||||
i8042.noaux [HW] Don't check for auxiliary (== mouse) port
|
||||
i8042.nokbd [HW] Don't check/create keyboard port
|
||||
i8042.noloop [HW] Disable the AUX Loopback command while probing
|
||||
for the AUX port
|
||||
i8042.nomux [HW] Don't check presence of an active multiplexing
|
||||
controller
|
||||
i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Cobalt button interface driver.
|
||||
*
|
||||
* Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
|
||||
* Copyright (C) 2007-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -15,7 +15,7 @@
|
|||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
#include <linux/input-polldev.h>
|
||||
|
@ -55,7 +55,7 @@ static void handle_buttons(struct input_polled_dev *dev)
|
|||
status = ~readl(bdev->reg) >> 24;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(bdev->keymap); i++) {
|
||||
if (status & (1UL << i)) {
|
||||
if (status & (1U << i)) {
|
||||
if (++bdev->count[i] == BUTTONS_COUNT_THRESHOLD) {
|
||||
input_event(input, EV_MSC, MSC_SCAN, i);
|
||||
input_report_key(input, bdev->keymap[i], 1);
|
||||
|
@ -97,16 +97,16 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
|
|||
input->name = "Cobalt buttons";
|
||||
input->phys = "cobalt/input0";
|
||||
input->id.bustype = BUS_HOST;
|
||||
input->cdev.dev = &pdev->dev;
|
||||
input->dev.parent = &pdev->dev;
|
||||
|
||||
input->keycode = pdev->keymap;
|
||||
input->keycodemax = ARRAY_SIZE(pdev->keymap);
|
||||
input->keycode = bdev->keymap;
|
||||
input->keycodemax = ARRAY_SIZE(bdev->keymap);
|
||||
input->keycodesize = sizeof(unsigned short);
|
||||
|
||||
input_set_capability(input, EV_MSC, MSC_SCAN);
|
||||
__set_bit(EV_KEY, input->evbit);
|
||||
for (i = 0; i < ARRAY_SIZE(buttons_map); i++)
|
||||
__set_bit(input->keycode[i], input->keybit);
|
||||
for (i = 0; i < ARRAY_SIZE(cobalt_map); i++)
|
||||
__set_bit(bdev->keymap[i], input->keybit);
|
||||
__clear_bit(KEY_RESERVED, input->keybit);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
|
|
|
@ -116,8 +116,8 @@ static void alps_process_packet(struct psmouse *psmouse)
|
|||
}
|
||||
|
||||
if (priv->i->flags & ALPS_FW_BK_1) {
|
||||
back = packet[2] & 4;
|
||||
forward = packet[0] & 0x10;
|
||||
back = packet[0] & 0x10;
|
||||
forward = packet[2] & 4;
|
||||
}
|
||||
|
||||
if (priv->i->flags & ALPS_FW_BK_2) {
|
||||
|
@ -483,6 +483,7 @@ int alps_init(struct psmouse *psmouse)
|
|||
dev2->id.vendor = 0x0002;
|
||||
dev2->id.product = PSMOUSE_ALPS;
|
||||
dev2->id.version = 0x0000;
|
||||
dev2->dev.parent = &psmouse->ps2dev.serio->dev;
|
||||
|
||||
dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
|
||||
dev2->relbit[BIT_WORD(REL_X)] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
|
||||
|
|
75
drivers/input/serio/i8042-snirm.h
Normal file
75
drivers/input/serio/i8042-snirm.h
Normal file
|
@ -0,0 +1,75 @@
|
|||
#ifndef _I8042_SNIRM_H
|
||||
#define _I8042_SNIRM_H
|
||||
|
||||
#include <asm/sni.h>
|
||||
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Names.
|
||||
*/
|
||||
|
||||
#define I8042_KBD_PHYS_DESC "onboard/serio0"
|
||||
#define I8042_AUX_PHYS_DESC "onboard/serio1"
|
||||
#define I8042_MUX_PHYS_DESC "onboard/serio%d"
|
||||
|
||||
/*
|
||||
* IRQs.
|
||||
*/
|
||||
static int i8042_kbd_irq;
|
||||
static int i8042_aux_irq;
|
||||
#define I8042_KBD_IRQ i8042_kbd_irq
|
||||
#define I8042_AUX_IRQ i8042_aux_irq
|
||||
|
||||
static void __iomem *kbd_iobase;
|
||||
|
||||
#define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
|
||||
#define I8042_DATA_REG (kbd_iobase + 0x60UL)
|
||||
|
||||
static inline int i8042_read_data(void)
|
||||
{
|
||||
return readb(kbd_iobase + 0x60UL);
|
||||
}
|
||||
|
||||
static inline int i8042_read_status(void)
|
||||
{
|
||||
return readb(kbd_iobase + 0x64UL);
|
||||
}
|
||||
|
||||
static inline void i8042_write_data(int val)
|
||||
{
|
||||
writeb(val, kbd_iobase + 0x60UL);
|
||||
}
|
||||
|
||||
static inline void i8042_write_command(int val)
|
||||
{
|
||||
writeb(val, kbd_iobase + 0x64UL);
|
||||
}
|
||||
static inline int i8042_platform_init(void)
|
||||
{
|
||||
/* RM200 is strange ... */
|
||||
if (sni_brd_type == SNI_BRD_RM200) {
|
||||
kbd_iobase = ioremap(0x16000000, 4);
|
||||
i8042_kbd_irq = 33;
|
||||
i8042_aux_irq = 44;
|
||||
} else {
|
||||
kbd_iobase = ioremap(0x14000000, 4);
|
||||
i8042_kbd_irq = 1;
|
||||
i8042_aux_irq = 12;
|
||||
}
|
||||
if (!kbd_iobase)
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void i8042_platform_exit(void)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
#endif /* _I8042_SNIRM_H */
|
|
@ -277,6 +277,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
|
|||
DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.ident = "Lenovo 3000 n100",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
|
||||
},
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
|
@ -1151,7 +1151,6 @@ static int __devinit i8042_setup_kbd(void)
|
|||
static int __devinit i8042_probe(struct platform_device *dev)
|
||||
{
|
||||
int error;
|
||||
char param;
|
||||
|
||||
error = i8042_controller_selftest();
|
||||
if (error)
|
||||
|
@ -1174,7 +1173,7 @@ static int __devinit i8042_probe(struct platform_device *dev)
|
|||
}
|
||||
#ifdef CONFIG_X86
|
||||
if (i8042_dritek) {
|
||||
param = 0x90;
|
||||
char param = 0x90;
|
||||
error = i8042_command(¶m, 0x1059);
|
||||
if (error)
|
||||
goto out_fail;
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
#include "i8042-jazzio.h"
|
||||
#elif defined(CONFIG_SGI_HAS_I8042)
|
||||
#include "i8042-ip22io.h"
|
||||
#elif defined(CONFIG_SNI_RM)
|
||||
#include "i8042-snirm.h"
|
||||
#elif defined(CONFIG_PPC)
|
||||
#include "i8042-ppcio.h"
|
||||
#elif defined(CONFIG_SPARC)
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
* Copyright (c) 2000 Daniel Egger <egger@suse.de>
|
||||
* Copyright (c) 2001 Frederic Lepied <flepied@mandrakesoft.com>
|
||||
* Copyright (c) 2004 Panagiotis Issaris <panagiotis.issaris@mech.kuleuven.ac.be>
|
||||
* Copyright (c) 2002-2007 Ping Cheng <pingc@wacom.com>
|
||||
* Copyright (c) 2002-2008 Ping Cheng <pingc@wacom.com>
|
||||
*
|
||||
* ChangeLog:
|
||||
* v0.1 (vp) - Initial release
|
||||
|
@ -65,6 +65,7 @@
|
|||
* - and wacom_wac.c deals with Wacom specific code
|
||||
* - Support Intuos3 4x6
|
||||
* v1.47 (pc) - Added support for Bamboo
|
||||
* v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -85,7 +86,7 @@
|
|||
/*
|
||||
* Version Information
|
||||
*/
|
||||
#define DRIVER_VERSION "v1.47"
|
||||
#define DRIVER_VERSION "v1.48"
|
||||
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
|
||||
#define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"
|
||||
#define DRIVER_LICENSE "GPL"
|
||||
|
@ -125,6 +126,7 @@ extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac
|
|||
extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
|
||||
extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
|
||||
extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
|
||||
extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
|
||||
extern __u16 wacom_le16_to_cpu(unsigned char *data);
|
||||
extern __u16 wacom_be16_to_cpu(unsigned char *data);
|
||||
extern struct wacom_features * get_wacom_feature(const struct usb_device_id *id);
|
||||
|
|
|
@ -171,6 +171,7 @@ void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
|
|||
input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
|
||||
BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
|
||||
input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
|
||||
input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
|
||||
}
|
||||
|
||||
void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
|
||||
|
@ -180,6 +181,11 @@ void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
|
|||
input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
|
||||
}
|
||||
|
||||
void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
|
||||
{
|
||||
input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
|
||||
}
|
||||
|
||||
void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
|
||||
{
|
||||
input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);
|
||||
|
|
|
@ -163,7 +163,9 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
|
|||
}
|
||||
|
||||
id = STYLUS_DEVICE_ID;
|
||||
if (data[1] & 0x80) { /* in prox */
|
||||
if ((data[1] & 0x80) && ((data[1] & 0x07) || data[2] || data[3] || data[4]
|
||||
|| data[5] || data[6] || (data[7] & 0x07))) {
|
||||
/* in prox and not a pad data */
|
||||
|
||||
switch ((data[1] >> 5) & 3) {
|
||||
|
||||
|
@ -233,7 +235,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
|
|||
if (data[7] & 0xf8) {
|
||||
wacom_input_sync(wcombo); /* sync last event */
|
||||
wacom->id[1] = 1;
|
||||
wacom->serial[1] = (data[7] & 0xf8);
|
||||
wacom_report_key(wcombo, BTN_0, (data[7] & 0x40));
|
||||
wacom_report_key(wcombo, BTN_4, (data[7] & 0x80));
|
||||
rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3);
|
||||
|
@ -252,10 +253,9 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
|
|||
}
|
||||
break;
|
||||
case WACOM_MO:
|
||||
if ((data[7] & 0xf8) || (data[8] & 0x80)) {
|
||||
if ((data[7] & 0xf8) || (data[8] & 0xff)) {
|
||||
wacom_input_sync(wcombo); /* sync last event */
|
||||
wacom->id[1] = 1;
|
||||
wacom->serial[1] = (data[7] & 0xf8);
|
||||
wacom_report_key(wcombo, BTN_0, (data[7] & 0x08));
|
||||
wacom_report_key(wcombo, BTN_1, (data[7] & 0x20));
|
||||
wacom_report_key(wcombo, BTN_4, (data[7] & 0x10));
|
||||
|
@ -434,10 +434,12 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
|
|||
wacom_report_key(wcombo, BTN_5, (data[6] & 0x02));
|
||||
wacom_report_key(wcombo, BTN_6, (data[6] & 0x04));
|
||||
wacom_report_key(wcombo, BTN_7, (data[6] & 0x08));
|
||||
wacom_report_key(wcombo, BTN_8, (data[5] & 0x10));
|
||||
wacom_report_key(wcombo, BTN_9, (data[6] & 0x10));
|
||||
wacom_report_abs(wcombo, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]);
|
||||
wacom_report_abs(wcombo, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]);
|
||||
|
||||
if((data[5] & 0x0f) | (data[6] & 0x0f) | (data[1] & 0x1f) |
|
||||
if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) |
|
||||
data[2] | (data[3] & 0x1f) | data[4])
|
||||
wacom_report_key(wcombo, wacom->tool[1], 1);
|
||||
else
|
||||
|
@ -481,13 +483,11 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
|
|||
if (data[1] & 0x02) {
|
||||
/* Rotation packet */
|
||||
if (wacom->features->type >= INTUOS3S) {
|
||||
/* I3 marker pen rotation reported as wheel
|
||||
* due to valuator limitation
|
||||
*/
|
||||
/* I3 marker pen rotation */
|
||||
t = (data[6] << 3) | ((data[7] >> 5) & 7);
|
||||
t = (data[7] & 0x20) ? ((t > 900) ? ((t-1) / 2 - 1350) :
|
||||
((t-1) / 2 + 450)) : (450 - t / 2) ;
|
||||
wacom_report_abs(wcombo, ABS_WHEEL, t);
|
||||
wacom_report_abs(wcombo, ABS_Z, t);
|
||||
} else {
|
||||
/* 4D mouse rotation packet */
|
||||
t = (data[6] << 3) | ((data[7] >> 5) & 7);
|
||||
|
@ -558,6 +558,7 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
|
|||
case INTUOS3:
|
||||
case INTUOS3L:
|
||||
case CINTIQ:
|
||||
case WACOM_BEE:
|
||||
return (wacom_intuos_irq(wacom_wac, wcombo));
|
||||
break;
|
||||
default:
|
||||
|
@ -577,6 +578,8 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
|
|||
case GRAPHIRE:
|
||||
input_dev_g(input_dev, wacom_wac);
|
||||
break;
|
||||
case WACOM_BEE:
|
||||
input_dev_bee(input_dev, wacom_wac);
|
||||
case INTUOS3:
|
||||
case INTUOS3L:
|
||||
case CINTIQ:
|
||||
|
@ -607,12 +610,15 @@ static struct wacom_features wacom_features[] = {
|
|||
{ "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 63, GRAPHIRE },
|
||||
{ "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 63, WACOM_G4 },
|
||||
{ "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 63, WACOM_G4 },
|
||||
{ "Wacom BambooFun 4x5", 9, 14760, 9225, 511, 63, WACOM_MO },
|
||||
{ "Wacom BambooFun 6x8", 9, 21648, 13530, 511, 63, WACOM_MO },
|
||||
{ "Wacom Volito", 8, 5104, 3712, 511, 63, GRAPHIRE },
|
||||
{ "Wacom PenStation2", 8, 3250, 2320, 255, 63, GRAPHIRE },
|
||||
{ "Wacom Volito2 4x5", 8, 5104, 3712, 511, 63, GRAPHIRE },
|
||||
{ "Wacom Volito2 2x3", 8, 3248, 2320, 511, 63, GRAPHIRE },
|
||||
{ "Wacom PenPartner2", 8, 3250, 2320, 255, 63, GRAPHIRE },
|
||||
{ "Wacom PenPartner2", 8, 3250, 2320, 511, 63, GRAPHIRE },
|
||||
{ "Wacom Bamboo", 9, 14760, 9225, 511, 63, WACOM_MO },
|
||||
{ "Wacom Bamboo1", 8, 5104, 3712, 511, 63, GRAPHIRE },
|
||||
{ "Wacom Intuos 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
|
||||
{ "Wacom Intuos 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
|
||||
{ "Wacom Intuos 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
|
||||
|
@ -643,6 +649,7 @@ static struct wacom_features wacom_features[] = {
|
|||
{ "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3 },
|
||||
{ "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S },
|
||||
{ "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ },
|
||||
{ "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE },
|
||||
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
|
||||
{ }
|
||||
};
|
||||
|
@ -656,12 +663,15 @@ static struct usb_device_id wacom_ids[] = {
|
|||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x15) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x63) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x64) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x65) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x69) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },
|
||||
|
@ -692,6 +702,7 @@ static struct usb_device_id wacom_ids[] = {
|
|||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },
|
||||
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
|
||||
{ }
|
||||
};
|
||||
|
|
|
@ -25,6 +25,7 @@ enum {
|
|||
INTUOS3,
|
||||
INTUOS3L,
|
||||
CINTIQ,
|
||||
WACOM_BEE,
|
||||
WACOM_MO,
|
||||
MAX_TYPE
|
||||
};
|
||||
|
|
|
@ -213,7 +213,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
|
|||
struct ads7846 *ts = dev_get_drvdata(dev);
|
||||
struct ser_req *req = kzalloc(sizeof *req, GFP_KERNEL);
|
||||
int status;
|
||||
int sample;
|
||||
int uninitialized_var(sample);
|
||||
int use_internal;
|
||||
|
||||
if (!req)
|
||||
|
|
Loading…
Reference in a new issue