*linux-wacom master git
http://sourceforge.net/p/linuxwacom/input-wacom/ci/input-wacom-0.28.0/tree/3.7/
*input-wacom-0.28.0
4bd947c Fix small issues with latest round of backports
888f327 backport: HID: wacom: fix an Oops caused by wacom_wac_finger_count_touches
2b042d6 backport: HID: wacom: Add support for Cintiq 13HD Touch
cb12693 backport: HID: wacom: use wacom_wac_finger_count_touches to set touch_down
33cbf3a backport: HID: wacom: remove hardcoded WACOM_QUIRK_MULTI_INPUT
77249d4 backport: HID: wacom: rely on actual touch down count to decide touch_down
2ae99ae Add support for ISDv4 0x5010
a826216 backport: HID: wacom: Add battery presence indicator to wireless tablets
6aef663 backport: HID: wacom: drop WACOM_PKGLEN_STATUS
6f7af9b backport: HID: wacom: Status packet provides 'charging', not 'powered' bit
b01d598 backport: HID: wacom: Report battery status for Intuos Pro and Intuos5
5320392 backport: HID: wacom: Provide battery charge state to system over USB if available
6fbc91f backport: HID: wacom: Allow dynamic battery creation/destruction
3225254 backport: HID: wacom: Centralize updating of wacom_wac battery status
cba0e2f backport: HID: wacom: Move handling of Intuos status packets to seperate function
c8ef191 backport: Input: wacom - enhance Wireless Receiver battery reporting
b2ec888 Sync pid format in 3.7/wacom_wac.c with upstream
070941a Backport: Add support for Cintiq 27QHD and 27QHD touch
1dd75a7 Backport: report In Range event according to the spec
c8bc3a4 Backport: process invalid Cintiq and Intuos data in wacom_intuos_inout()
42d4e22 Backport: Make sure touch arbitration is applied consistently across devices
2e9471c Report ABS_MISC event for Cintiq Companion Hybrid
e48dc70 automake: Add install and modules_install targets
30ded6a Backport: Add support for DTU-1031X
9d2d8ab Backport: Update maximum X/Y accounding to outbound offset
296f6ac Backport: add defines for new Cintiq and DTU outbound tracking
acec09d Backport: make sure touch_input is valid before using it
9398891 Backport: make the WL connection friendly for the desktop
7f573e0 Backport: Add support for the Cintiq Companion
3d24359 Backport: wacom - Bamboo pen-only tablet does not support PAD
695088b Backport: wacom - Add support for Intuos Pen Medium
b5c4360 backport: Input: wacom - put a flag when the led are initialized
495e4d7 Use backwards-compatible battery name only for first tablet
9e1bc72 Fix compile issues with 3.17 backports
fcd6bcb Backport: HID: wacom - enable LED support for Wireless Intuos5/Pro
3a76f30 Backport: HID: wacom - Clean up of sysfs
f639f32 Backport: HID: wacom - Add default permission defines for sysfs attributes
f1ad990 input: wacom: Add support for 0x12C ISDv4 sensor
58c1e4d input: wacom: Support up to 2048 pressure levels with ISDv4
ddd011f Input: wacom - process outbound for newer Cintiqs
0e72c0b Input: wacom - cleanup multitouch code when touch_max is 2
01330ef Backport: Input: wacom - set stylus_in_proximity when pen is in range
71df94a Align 3.7 directory with upstream
8727e40 Input: wacom: Use unaligned access where necessary
ecff90f Input: wacom: Add support for three new ISDv4 sensors
dabcba4 Input: wacom: Add support for 0x116 sensor on Win8 Panasonic CF-H2
0f3de50 Input: wacom - missed the last bit of expresskey for DTU-1031
5769244 Input: wacom - add support for ISDv4 0x10E sensor
71786ff Input: wacom - handle 1024 pressure levels in wacom_tpc_pen
6c0d36d Input: wacom - references to 'wacom->data' should use 'unsigned char*'
5a79c89 Input: wacom - override 'pressure_max' with value from HID_USAGE_PRESSURE
e8e12ad Input: wacom - use full 32-bit HID Usage value in switch statement
2d38b3c backport: Input: wacom - Export battery scope
9e3dd10 Input: wacom - add support for DTU-1031
955bc05 Input: wacom - add reporting of SW_MUTE_DEVICE events
08bb7df Add support for three new Intuos devices
640624d Make sure touch_max is set for touch devices
b208274 Scale up touch width and height values for Intuos Pro
719baa4 Not all multi-interface devices support touch
9ba2249 Have Intuos check just WACOM_QUIRK_MULTI_INPUT bit
74ac82b Add support for ISDv4 0x10F
bed4614 Input: wacom - add support for three new Intuos Pro devices
e3a8665 Input: wacom - LED is only supported through digitizer interface
1e73afc Input: wacom - testing result shows get_report is unnecessary.
d52de51 backport: Send proper tablet state info when pen leaves proximity
5242598 backport: Support EMR and MFT sensors of Cintiq Companion Hybrid
df685e7 Input: wacom - fix error return code in wacom_probe()
3ad49de input : wacom - Integrate resolution calculation
0f4a771 Input: wacom - add support for 0x300 and 0x301
e25e484 Add a new stylus (0x100802) for Intuos5 and Cintiqs
cd6482b input : wacom - add an eraser to DTH2242/DTK2241
a0addfe Backport: fix a typo for Cintiq 22HDT
6fc89ce Backport: add a few new styli for Cintiq series
ddd1522 Backport: add three new display tablets
6513c4c input: wacom: Fix "can not retrieve extra class descriptor" for DTH2242
79c96a4 Input: wacom - DTH2242 Grip Pen id was one bit off
0eed0a2 Input: wacom: Correct reported resolution for Intuos4 Wireless
b6c8938 input: wacom: Fix "can not retrieve extra class descriptor" for 24HDT
c32debd Backport: Input : wacom - add support for 0x10d
d4e0d81 Input: wacom - add support for DTH-2242
f20882b Input: wacom - fix wacom_set_report retry logic
dff630c input: wacom - use new input-mt routines
f146729 input: wacom - Prepare for syncing with input-mt changes
907a175 Backport: Input: wacom - fix touch support for Bamboo Fun CTH-461
08e273c Input: wacom - add support for a new MT device (0x4001)
7ffbac8 Input: wacom - simplify type check for newer V5 devices
3f35a08 synchronize: Merge dtor/next into 3.7 and 2.6.38
f83b267 backport: add support for 2 new multi-touch tablets (0x100 and 0x101)
af4b7e2 backport: clean up device type code
891539f Move TPC1FGE and 24HDT REPORT to where they belong
3458488 backport: add touch sensor support for Cintiq 24HD touch
eb104b0 backport: clean up wacom_query_tablet_data
f4d0b33 backport: introduce wacom_fix_phy_from_hid
2714e6d backport: handle split-sensor devices with internal hubs
c36bfe3 backport: allow any multi-input Intuos device to set prox
f87ebd4 backport: report correct touch contact size for I5/Bamboo
8606089 backport: add support for EMR on Cintiq 24HD touch
56eff87 dbg() is not supported by newer kernels (3.7 and later)
bbafabe Add INPUT_PROP_DIRECT flag to Cintiq 24HD
b5a46f8 Initialize & destroy LEDs for all Intuos4 tablets
28bff0e Input: wacom - Mark Intuos5 pad as in-prox when touching buttons
fffaa60 Add support to kernel 4.7
Change-Id: I59de5468d502337afb331a47ebd72a71a876968e
Signed-off-by: jude84.kim <jude84.kim@lge.com>
plus send begin and end of express keys events for
Cintiq 13HD and DTH2242/DTK2241
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Add new styli for Cintiq 13HD and 22HD. Update comments for
for tools. Check whole 10 nibbles of tool ID for tool
types. Remove unuecessary tool type for Intuos series PAD.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Same as Cintiq 24HDT, DTH2242 has two interfaces sharing one configuration.
This patch ignores the second interface.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
The MFT device in the Cintiq 24HDT has two interfaces sharing the
same configuration. Without this patch, the driver attempts to
make use of both interfaces, even though the second interface is
not compatible with this driver.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Tested-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
It is a Wacom device found in Fujitsu Lifebook T902.
Signed-off-by: Stephan Frank <sfrank@cs.tu-berlin.de>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This patch brings wacom driver in-sync with input-mt changes
made in release 3.7.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Henrik added new MT routines in release 3.7. This patch is to prepare
for the use of new MT routines.
In the newly added wacom_abs_set_axis() function, the first
if-statement assigns ABS_X/Y for number of contacts less or equal
to 2. So, it is single and 2 finger touch devices. Two finger touch
devices are processed here since they will not use the updated
input_mt_init_slots(), which does not offer benefit to those devices.
input_mt_init_slots() will take care of ABS_X/Y assignment when flags
are not zero. All touch devices with more than two contacts will use
input_mt_init_slots() with non-zero flags.
The second if-statement is for all MT devices, which include two
finger touch devices.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Commit f393ee2b81 forgot to add the
touch_max property for Wacom Bamboo Fun CTH-461/S, ID 056a:00d2.
This broke the touch functionality for that device. This patch,
(done with help of Ping Cheng), adds the correct value and makes
touch work again.
Signed-off-by: Diego Calleja <diegocg@gmail.com>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
The updated type enum enables this implementation.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This adds support for the two new multi-touch tablets.
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQEcBAABAgAGBQJQjYaSAAoJEHm+PkMAQRiGIlYH+wbwj7i5CcUG46VRFT5WlG7W
iYaojL68FKKIUCBh4GOvZxE2D907KgqHQI6rePE/xDhK493d0Nyi4PGQJ1JoTE+l
JQq++C3CoX9mm/zCRW5JyOcemE4t2t1/poi2ege9Kf9E9N5Cw0P4r8Cz1urCFKL6
EO2/gA5d6cBQpg+gVq9T88SnYgiJGs7d8AYjFeC7SrqIwDvG6tfg+YF4IRxC4QAc
0zbBgej/kbuiLbGl2ltU0I9HTOwlTgp53tdYe810cs3CdzNC2ykdF391Q24tloeo
uxmCSQrA2upHA9aILqY+T5f+cMOpVS4T8Ica3N9OzVEIPXSh2K9d4tESGPikMEE=
=yiDr
-----END PGP SIGNATURE-----
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Decode multitouch reports from the touch sensor of the Cintiq 24HD
touch.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Like our other pen-and-touch products, the Cintiq 24HD touch needs data
to be shared between its two sensors to facilitate proximity-based palm
rejection.
Unlike other tablets that report sensor data through separate interfaces
of the same USB device, the Cintiq 24HD touch has separate USB devices
that are connected to an internal USB hub.
This patch makes it possible to designate the USB VID/PID of the other
device so that the two may share data. To ensure we don't accidentally
link to a sensor from a physically separate device (if several have been
plugged in), we limit the search to siblings (i.e., devices directly
connected to the same hub).
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
The ability to set the proximity flag should apply to any device
that has both pen and touch input. Rather than listing classes of
devices known to meet this criteria, simply filter on the quirk
defining all such devices.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Tested-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This changes how the touch packets for Intuos5 and 3rd-gen Bamboo
are interpreted, so that proper values for the MAJOR and MINOR
axes are reported. Instead of using the amplitude field (data[6]),
we use the size field (data[5]) and do some calculation to
transform it from a scaled-down area into axis lengths.
Note that even though we assume a circular contact, both MAJOR and
MINOR are reported since the resolution of the X and Y axes differ.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Merge Henrik's updates to multitouch code. Even though Jiri already
pulled them in I need to do it too since my changes to evdev using
dynamic major would clash with them.
If the ExpressKeys on the Intuos5 are touched, they currently result
an out-of-prox packet being sent even if the pad is already out of
prox. This can cause some confusion in the X driver. To restore the
expected semantics, we make being touched a sufficient condition to
signal proximity.
https://bugs.freedesktop.org/show_bug.cgi?id=54250
Reported-by: Timo Aaltonen <tjaalton@ubuntu.com>
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Preparing to move more repeated code into the mt core, add a flags
argument to the input_mt_slots_init() function.
Reviewed-and-tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Tested-by: Ping Cheng <pingc@wacom.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Adds support for the EMR digitizer on the Cintiq 24HD touch. The
EMR digitizer should work identically to that found on the Cintiq
24HD. The touch digitizer is a separate USB device similar to how
we split apart some other devices.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Adds support for the EMR digitizer on the Cintiq 24HD touch. The
EMR digitizer should work identically to that found on the Cintiq
24HD. The touch digitizer is a separate USB device similar to how
we split apart some other devices.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Bamboo One's with ID of 0x6a and 0x6b were added with correct
indication of 1024 pressure levels but the Graphire packet routine
was only looking at 9 bits. Increased to 10 bits.
This bug caused these devices to roll over to zero pressure at half
way mark.
The other devices using this routine only support 256 or 512 range
and look to fix unused bits at zero.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Reported-by: Tushant Mirchandani <tushantin@gmail.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
So we can simplify a few type related if statements
Signed-off-by: Ping Cheng <pingc@wacom.com>
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Main part of patch is adding support for a new Wacom MT touch
packet and labels these devices using MTSCREEN type.
Other items of interest:
Delete some duplicate code in HID parsing for Y info since
its already done in X path.
In wacom_query_tablet_data(), only invoke the set report
that requests tablets to send Wacom Touch packets for
Finger interfaces. Mostly, this is to make code intent clear.
Tested-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
From the HID usage table when it is supported.
Tested-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Intuos5 tablets with PTH-* model numbers include a multitouch sensor
which use the same touch reports as the 3rd-generation Bamboo. No
useful information is in the HID descriptor for the touch interface
so hardcoded values are used during setup.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Intuos5 uses a new report type for Touch Ring and ExpressKey data.
Note that data from the capacitive sensors present on the ExpressKeys
will be ignored until a proper way is found to expose it.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This patch adds support for the basic pen functions of Intuos5
tablets.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
When a tablet connect or disconnect is detected, schedule
work queue to register or unregister related input devices.
When a wireless tablet connects, it reports same USB PID
used if tablet is connected with USB cable. Use this to
update features values, set input capabilities, and then
register device. From there, the Pen and Touch interfaces
will reuse the existing tablet's IRQ routines.
Its possible that 1 receiver is shared with 2 tablets with
different PID (small and medium Bamboo for example) so the
input is unregister at disconnect to better support this case.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Tested-by: Jason Gerecke <killertofu@gmail.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
The 3rd gen Bamboo Pen & Touch and Intuos5 tablets support an
optional wireless module. When its receiver is plugged into USB,
it presents 3 interfaces: 0) Monitor 1) Pen and 2) Touch.
The exact capabilities of the Pen and Touch interfaces can
not be determined until a tablet connection is established
and reported over the Monitor interface.
This patch detects this wireless receiver and enables interrupt
packets to be processed for the Monitor interface. Processing
the data in packets will be left to another patch.
Since it doesn't make sense to create an input device for the
Monitor interface, it is not created. Creation of Pen and Touch
input device is also delayed until monitor packets can be processed.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Tested-by: Jason Gerecke <killertofu@gmail.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
jude84.kim