aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/tablet
AgeCommit message (Collapse)AuthorFilesLines
2011-07-06Input: wacom - cleanup a return value for the old BambooPing Cheng1-1/+1
The old code may call input_sync() without sending any other events. While it will be suppressed by the input core not calling it at all is still cheaper. Signed-off-by: Ping Cheng <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-07-06Input: wacom - update Graphire4 and old Bamboo tablet buttonsPing Cheng1-11/+8
Bamboo touch sets BTN_BACK, BTN_FORWARD, BTN_LEFT, and BTN_RIGHT as the default button events for tablet buttons. Change Graphire4 and old Bamboo to the same settings. Signed-off-by: Ping Cheng <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-07-06Input: wacom - add serial number for Graphire4 and old BambooPing Cheng1-0/+1
With the removal of BTN_TOOL_FINGER for tablet buttons and expresskeys, serial number is needed to distingush if the events were from a regular tool (stylus, eraser, or mouse) or the attribures (buttons, strips, or wheels) on the tablet since there are overlapped events between the tools and the tablet attributes. Signed-off-by: Ping Cheng <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Reviewed-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-07-06Input: wacom - remove BTN_TOOL_FINGER for padPing Cheng1-11/+0
BTN_TOOL_FINGER was designed to indicate a single finger touch. Remove the lines that borrowed this type for expresskeys and tablet buttons. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-06-27Input: wacom - add 3 new models - 6A, 6B, and 97Ping Cheng1-0/+12
Tested-by: Alex Tervoort <[email protected]> for 6A Signed-off-by: David Foley <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-06-27Input: wacom - Wacom Bamboo Pen D4 has 1024 pressure levelsPing Cheng1-1/+1
D4 has 1024, not 512, pressure levels. Reported-by: David Foley <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-06-22Input: wacom - use only one interface with DTU-2231Aristeu Rozanski1-1/+13
The Wacom DTU-2231 tablet has two interfaces on its default configuration and both have HID class, leading to the creation of two input devices instead of one. Only the first one is used, so filter out the second. Signed-off-by: Aristeu Rozanski <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-06-22Input: wacom - Cintiq 21UX2 does not have menu stripsPing Cheng1-2/+5
So don't set ABS_RX/ABS_RY for them. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-31Input: wacom - add support for Lenovo tablet ID (0xE6)Manoj Iyer1-0/+4
Signed-off-by: Manoj Iyer <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-26Input: wacom - report resolution for pen devicesPing Cheng2-92/+181
Touch resolution is reported to the userland by retrieving the value from the HID descriptor. But pen resolution is not since it can not be retrieved. The current Wacom X driver has a resolution table. To centralize the source of these values, the resolution entries are added in the wacom_features struct for x and y coordinates respectively. The values are then reported to the userland. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-26Input: wacom - constify wacom_features for a new missed Bamboo modelsPing Cheng1-8/+8
Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-18Merge branch 'next' into for-linusDmitry Torokhov3-166/+99
2011-03-12Input: wacom - support 2FGT in MT formatPing Cheng2-18/+53
Reviewed-by: Henrik Rydberg <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-12Input: wacom - support one finger touch the touchscreen wayPing Cheng2-90/+50
There are two types of 1FGT devices supported in wacom_wac.c. Changing them to follow the existing touchscreen format, i.e., only report BTN_TOUCH as a valid tool type. Touch data will be ignored if pen is in proximity. This requires a touch up event sent if touch was down when pen comes in. The touch up event should be sent before any pen events are emitted. Otherwise, two pointers would race for the cursor. However, we can not send a touch up inside wacom_tpc_pen since pen and touch are on different logical port. That is why we have to check if touch is up before sending pen events. Reviewed-by: Henrik Rydberg <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-12Input: wacom - process pen data in its own routinePing Cheng1-33/+40
So it would be easier for patch reviewers to follow the data path. Reviewed-by: Henrik Rydberg <[email protected]> Reviewed-by: Chris Bagwell <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-03-12Input: wacom - do not send 2FGT Tablet PC events in TAP formatPing Cheng2-79/+10
2FGT Tablet PC touch events were processed in _TAP_ format. Remove them so we can change to _MT_ format. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-02-11Input: wacom - fix error path in wacom_probe()Alexander Strakh1-1/+1
If we fail to retrieve HID descriptor we need to free allocated URB so jump to proper label to do that. Signed-off-by: Alexander Strakh <[email protected]> Acked-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-01-25Input: wacom - pass touch resolution to clients through input_absinfoPing Cheng1-2/+19
Also remove fake ABS_RX/ABS_RY "axes" that were used to report physical dimensions now that we have better way. Signed-off-by: Ping Cheng <[email protected]> Reviewed-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-01-24Input: wacom - add 2 Bamboo Pen and touch modelsPing Cheng1-0/+6
Reported-by: David Foley <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-01-06Merge branch 'next' into for-linusDmitry Torokhov2-23/+7
Conflicts: include/linux/input.h
2010-12-23Input: wacom - add support for digitizer in Lenovo W700Ajay Ramaswamy2-0/+8
Signed-off-by: Ajay Ramaswamy <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-12-16Merge branch 'next' of ↵Dmitry Torokhov2-23/+7
git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next Conflicts: drivers/input/Makefile
2010-12-16input: mt: Move tracking and pointer emulation to input-mtHenrik Rydberg2-22/+5
The drivers using the type B protocol all report tracking information the same way. The contact id is semantically equivalent to ABS_MT_SLOT, and the handling of ABS_MT_TRACKING_ID only complicates the driver. The situation can be improved upon by providing a common pointer emulation code, thereby removing the need for the tracking id in the driver. This patch moves all tracking event handling over to the input core, simplifying both the existing drivers and the ones currently in preparation. Acked-by: Ping Cheng <[email protected]> Acked-by: Jiri Kosina <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]>
2010-12-16input: mt: Collect slots initialization codeHenrik Rydberg1-1/+1
The MT slots devices all follow the same initialization pattern of creating slots and hinting about buffer size. Let drivers call an initialization function instead, and make sure it can be called repeatedly without side effects. Signed-off-by: Henrik Rydberg <[email protected]>
2010-12-16input: mt: Break out slots handlingHenrik Rydberg1-0/+1
In preparation for common code to handle a larger set of MT slots devices, move the slots handling over to a separate file. Signed-off-by: Henrik Rydberg <[email protected]>
2010-12-10Input: wacom - add another Bamboo Pen ID (0xd4)Kevin Granade1-0/+3
Add the features struct and device table entry to enable yet another version of Wacom Bamboo Pen (CTL460, Product ID 0xD4). Signed-off-by: Kevin Granade <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-12-07Input: wacom - add new Bamboo PT (0xdb)David Foley1-0/+3
Adds new Bamboo Pen & Touch model - Bamboo P & T Special Edition Medium (CTH661/L; Product ID = 0xdb). Tested-by: Tobias Verbeke <[email protected]> Signed-off-by: David Foley <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-11-30Input: wacom - add IDs for two new Bamboo PTsDavid Foley1-0/+6
Add two new Bamboo Pen & Touch models: Bamboo Comic Medium (CTH661/S1; Product ID = 0xd8) Bamboo P & T Special Edition Small (CTH461/L; Product ID = 0xdA) Tested-by: IRIE Shinsuke <[email protected]> Tested-by: Andrea Cadeddu <[email protected]> Signed-off-by: David Foley <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-11-15Input: aiptek - tighten up permissions on sysfs attributesDmitry Torokhov1-14/+14
Sysfs attributes affecting device behavior should not be, by default, world-writeable. If distributions want to allow console users access these attributes they need to employ udev and friends to adjust permissions as needed. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-11-10Input: acecad - fix a memory leak in usb_acecad_probe error pathAxel Lin1-1/+2
Add a missing usb_free_urb() in usb_acecad_probe() error path. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-10-24Input: wacom - specify Cinitq supported toolsPing Cheng1-12/+30
Cintiq, being a display tablet, doesn't have mouse and associated BTN_s. Make sure we do not specify them when registering Cintiq's input device so that userland can retrieve the exact tool set the device supports. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-10-17Input: wacom - properly enable runtime PMDmitry Torokhov1-3/+6
We need to always call usb_autopm_put_interface() in wacom_open(), not only when initialization fails, otherwise the device will be marked as PM-busy and will never be put in suspended state. Based on patch by Oliver Neukum. Acked-by: Oliver Neukum <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-10-17Merge branch 'for-linus' into nextDmitry Torokhov2-12/+15
2010-10-10Input: wacom - fix pressure in Cintiq 21UX2Aristeu Rozanski1-1/+3
Currently the pressure range in Cintiq 21UX2 is limited to half of the supported. This patch fixes the problem. Signed-off-by: Aristeu Rozanski <[email protected]> Acked-by: Ping Cheng <[email protected]> CC: [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
2010-10-04Input: wacom - fix runtime PM related deadlockDmitry Torokhov1-11/+12
When runtime PM is enabled by default for input devices, X hangs in wacom open: [<ffffffff814a00ea>] mutex_lock+0x1a/0x40 [<ffffffffa02bc94b>] wacom_resume+0x3b/0x90 [wacom] [<ffffffff81327a32>] usb_resume_interface+0xd2/0x190 [<ffffffff81327b5d>] usb_resume_both+0x6d/0x110 [<ffffffff81327c24>] usb_runtime_resume+0x24/0x40 [<ffffffff8130a2cf>] __pm_runtime_resume+0x26f/0x450 [<ffffffff8130a23a>] __pm_runtime_resume+0x1da/0x450 [<ffffffff8130a53a>] pm_runtime_resume+0x2a/0x50 [<ffffffff81328176>] usb_autopm_get_interface+0x26/0x60 [<ffffffffa02bc626>] wacom_open+0x36/0x90 [wacom] wacom_open() takes wacom->lock and calls usb_autopm_get_interface(), which in turn calls wacom_resume() which tries to acquire the lock again. The fix is to call usb_autopm_get_interface() first, before we take the lock. Since we do not do usb_autopm_put_interface() until wacom_close() is called runtime PM is effectively disabled for the driver, however changing it now would risk regressions so the complete fix will have to wait till the next merge window. Reported-by: Jiri Slaby <[email protected]> Acked-by: Oliver Neukum <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-29Input: hanwang - add support for Art Master HD 5012 tabletXing Wei1-21/+73
This adds support for hanwang Art Master HD 5012 electromagnetic tablet. Signed-off-by: Xing Wei <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-12Input: hanwang - make compatible with xf86-input-wacom driverXing Wei1-4/+33
Add necessary events so that Hanwang Art Master III tablet can be handled by the stock xf86-input-wacom driver. Signed-off-by: Xing Wei <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-12Input: wacom - disable Bamboo touchpad when pen is being usedChris Bagwell1-1/+7
Signed-off-by: Chris Bagwell <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-12Input: wacom - add support for Bamboo PenChris Bagwell1-0/+79
This adds support for Pen on Bamboo Pen and Bamboo Pen&Touch devices. Touchpad is handled by previous Bamboo Touch logic. Signed-off-by: Chris Bagwell <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-12Input: wacom - move Bamboo Touch irq to its own functionChris Bagwell1-4/+9
This is in preparation of pen support in same irq handler. Signed-off-by: Chris Bagwell <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-12Input: wacom - request tablet data for Bamboo PensChris Bagwell1-4/+5
Bamboo P&T need to use second form of usb_set_report() to ask to report tablet data. With previous addition of Bamboo Touch, BTN_TOOL_TRIPLETAP is now used for both TABLETPC2FG and BAMBOO_PT types. So reduced check to match type=TABLETPC2FG. This change shows redundant check for !TABLETPC2FG in else statement. Signed-off-by: Chris Bagwell <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wacom - add a quirk for low resolution Bamboo devicesHenrik Rydberg2-0/+11
The Bamboo Touch reports a sub-screen resolution of 480x320. The signal-to-noise ratio is only about 100, so filtering is needed in order to reduce the jitter to a usable level. However, the low resolution leads to round-off errors in the EWMA filter, resulting in extremely jerky pointer motion. This patch explicitly sets a higher resolution for those devices, and tells this to the completion handler via a low-resolution quirk. Signed-off-by: Henrik Rydberg <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wacom - add support for the Bamboo Touch trackpadHenrik Rydberg2-0/+92
Add support for the Bamboo Touch trackpad, and make it work with both the Synaptics X Driver and the Multitouch X Driver. The device uses MT slots internally, so the choice of protocol is a given. Signed-off-by: Henrik Rydberg <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wacom - collect device quirks into single functionHenrik Rydberg4-8/+24
Collect device-specific code into a single function, and use quirks to flag specific behavior instead. Signed-off-by: Henrik Rydberg <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wacom - parse the Bamboo device familyPing Cheng2-9/+37
The Bamboo devices have multiple interfaces which need to be setup separately. Use the HID parsing mechanism to achieve that. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wacom - add fuzz parameters to featuresHenrik Rydberg3-4/+15
The signal-to-noise ratio varies between devices, but currently all devices are treated the same way. Add fuzz parameters to the feature struct, allowing for tailored treatment of devices. Signed-off-by: Henrik Rydberg <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-01Input: add support for Hanwang tabletsXing Wei3-0/+377
Add support for Art Master III tablet of BeiJing HanwangTechnology Co, Ltd. Signed-off-by: Xing Wei <[email protected]> Acked-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: wacom - fix mousewheel handling for old wacom tabletsMike Auty1-2/+2
This fixes a regression introduced in 3b57ca0f80c5c8994b5b1e3d3f904cfe727951f2. The data[6] byte contains either 1 or -1 depending on the whether the mouse wheel on older wacom tablets is moved down (1) or up (-1). The patch introduced in the above commit changed the cast from (signed char) to (signed). When cast as a signed integer and negated, the value of -1 (stored in the byte as 0xff) became -255 rather than 1. This patch reverts the cast to a (signed char) and also removes an unnecessary (signed) cast, as all the values operated on are bitmasked. Signed-off-by: Mike Auty <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Cc; [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-10Merge branch 'next' into for-linusDmitry Torokhov2-11/+8
2010-08-02Input: switch to input_abs_*() access functionsDaniel Mack2-11/+8
Change all call sites in drivers/input to not access the ABS axis information directly anymore. Make them use the access helpers instead. Also use input_set_abs_params() when possible. Did some code refactoring as I was on it. Signed-off-by: Daniel Mack <[email protected]> Cc: Dmitry Torokhov <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.