summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* HID: multitouch: fix maxcontacts problem on GeneralTouchXianhan Yu2012-10-311-2/+1
| | | | | | | | | | | | | Fix maxcontacts problem for PWT GeneralTouch multi-touchscreen. Our device didn't contain HID_DG_CONTACTMAX usage. This usage use to describe touchscreen's maxcontacts for hid-multitouch.c to get maxcontacts automatic. We fix the device that driver can get maxcontact from our device, hence it doesn't need .maxcontact=10. Now there is just one device class can fix all our PWT touchscreen. Signed-off-by: Xianhan Yu <aroundight77@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* HID: multitouch: put the case in the right switch statementAlan Cox2012-10-311-1/+1
| | | | | | Signed-off-by: Alan Cox <alan@linux.intel.com> Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Merge branch 'multitouch' into for-linusJiri Kosina2012-10-011-7/+60
|\ | | | | | | | | Conflicts: drivers/hid/hid-multitouch.c
| * HID: multitouch: add support for GeneralTouch multi-touchscreenXianhan Yu2012-10-011-1/+17
| | | | | | | | | | | | | | | | | | Fix the touch-up no response problem on GeneralTouch twofingers touchscreen and modify the driver for new GeneralTouch PWT touchscreen. Signed-off-by: Xianhan Yu <aroundight77@gmail.com> Reviewed-by Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: Add ELAN production request when resume.Scott Liu2012-08-151-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Add ELAN production request when resume. Some Elan legacy devices require SET_IDLE to be set on resume. It should be safe to send it to other devices too. Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. Suggested by Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Scott Liu <scott.liu@emc.com.tw> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: Add support for eGalax 0x73f7Thierry Reding2012-08-151-0/+3
| | | | | | | | | | Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: hid-multitouch: Remove misleading null testHenrik Rydberg2012-08-151-6/+4
| | | | | | | | | | | | | | | | | | | | A null test was left behind during the autoloading work; the test was introduced by 8d179a9e, but was never completely reverted. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: add support for Touch Revolution touchscreensJiri Kosina2012-08-151-0/+9
| | | | | | | | | | Reported-by: Tom Mealey <thecompwiz@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: hid-multitouch: Add Flatfrog supportHenrik Rydberg2012-09-191-5/+21
| | | | | | | | | | | | | | | | | | Add support for the Flatfrog Multitouch 3200 panel. This panel advertises some fields that it does not use, hence the new quirk. Cc: Pablo Cases <pablo.cases@flatfrog.com> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
* | HID: hid-multitouch: Fix contact count on 3M panelsHenrik Rydberg2012-09-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | Some devices report the number of contacts via the unreliable CONTACTCOUNT usage, rather than using the CONTACTMAX feature. Without this patch, the 3M devices are constrained to the default maximum of ten fingers. Cc: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
* | HID: hid-multitouch: Remove the redundant touch stateHenrik Rydberg2012-09-191-65/+23
| | | | | | | | | | | | | | | | | | | | | | With the input_mt_sync_frame() function in place, there is no longer any need to keep the full touch state in the driver. This patch removes the slot state and replaces the lookup code with the input-mt equivalent. Reviewed-and-tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
* | HID: hid-multitouch: Simplify setup and frame synchronizationHenrik Rydberg2012-09-191-29/+38
| | | | | | | | | | | | | | | | | | | | | | With the input_configured() callback in place, the setup and frame synchronization can be simplified. The input device initialization is moved to mt_input_configured(), to make sure the full HID report has been seen. Reviewed-and-tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
* | Input: MT - Add flags to input_mt_init_slots()Henrik Rydberg2012-09-191-1/+1
|/ | | | | | | | | | 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>
* HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-06-281-0/+5
| | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* HID: hid-multitouch: fix input mode feature commandBenjamin Tissoires2012-06-281-1/+12
| | | | | | | | | | | | | | Zytronic panels shows a new way of setting the Input Mode feature. This feature is put in the second usage in the HID feature, instead of the first, as the majority of the multitouch devices. This patch adds a detection step when the feature is presented to know where the feature is located in the report. We can then trigger the right command to the device. This removes the magic number "0" in the function mt_set_input_mode. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* HID: multitouch: fix entry for Novatek TouchscreenJiri Kosina2012-06-061-1/+1
| | | | | | | | Since Henrik's autoloading changes, the proper macro for device entry is MT_USB_DEVICE(). Reported-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* HID: multitouch: add support for Novatek touchscreenAustin Hendrix2012-06-061-0/+5
| | | | | | | | Add support for a Novatek touchscreen panel as a generic HID multitouch panel. Signed-off-by: Austin Hendrix <ahendrix@willowgarage.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* HID: hid-multitouch: fix wrong protocol detectionBenjamin Tissoires2012-05-101-12/+46
| | | | | | | | | | | | | | The previous implementation introduced a randomness in the splitting of the different touches reported by the device. This version is more robust as we don't rely on hi->input->absbit, but on our own structure. This also prepares hid-multitouch to better support Win8 devices. [Jiri Kosina <jkosina@suse.cz>: fix build] Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* HID: multitouch: MT interface matching for BaantoJiri Kosina2012-05-051-1/+1
| | | | | | | | Baanto device entry needs to be altered in the same way other device entries have been changed in 2c2110e90b5 ("HID: hid-multitouch: Only match MT interfaces"). Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Merge branch 'multitouch' into device-groupsJiri Kosina2012-05-051-0/+4
|\ | | | | | | | | | | | | | | I am merging multitouch branch into device-groups so that support for Baanto device can be adjusted accordingly to the new autoloading patches. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: Add support for Baanto touchscreenJiri Kosina2012-04-201-0/+4
| | | | | | | | | | | | Reported-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk> Tested-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: hid-multitouch: Only match MT interfacesHenrik Rydberg2012-05-051-70/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All known hid-multitouch devices currently match any device group. However, some devices present interfaces belonging to different groups, resulting in a race between the hid-generic and hid-multitouch modules. This patch narrows the MT device list to match only HID_GROUP_MULTITOUCH, which solves the problem. As an exception, the USB_DEVICE_ID_CYPRESS_TRUETOUCH panel is not modified, in order to suppress the unwanted extra interfaces of the device. Reported-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: hid-multitouch: Switch to device groupsHenrik Rydberg2012-05-011-9/+19
|/ | | | | | | | | | | | | | | | | | | Switch the driver over to device group handling. By adding the HID_GROUP_MULTITOUCH group to hid-core, hid-generic will no longer match multitouch devices. By adding the HID_GROUP_MULTITOUCH entry to the device list, hid-multitouch will match all unknown multitouch devices, and udev will automatically load the module. Since HID_QUIRK_MULTITOUCH never gets set, the special quirks handling can be removed. Since all HID MT devices have HID_DG_CONTACTID, they can be removed from the hid_have_special_driver list. With this patch, the unknown device ids are no longer NULL, so the code is modified to check for the generic entry instead. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Merge branch 'upstream' into for-linusJiri Kosina2012-03-201-0/+5
|\ | | | | | | | | Conflicts: drivers/hid/Makefile
| * HID: multitouch: add PID for Fructel productAndreas Nielsen2012-03-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Adds multitouch support for the Gametel Android game controller. The multitouch events are emulated by the Gametel device. Each physical button is configured to generate a MT event on a specific coordinate. This seems to be the only way for us to support Android games that doesn't support HID gamepads. It is possible to inject MT events at Android level, but this requires root on the phone. Signed-off-by: Andreas Nielsen <eas@svep.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: detect serial protocolBenjamin Tissoires2012-03-121-0/+13
| | | | | | | | | | | | | | | | | | Microsoft's documentation about multitouch protocols tells that if a device presents one touch per report, then it should be treated as a serial protocol. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: handle all multitouch devices through hid-multitouchBenjamin Tissoires2012-03-121-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | When the quirk HID_QUIRK_MULTITOUCH is present and when hid-multitouch is loaded, let's pass the device to hid-multitouch even if it has not been registered in hid-multitouch. If any other driver wants to take precedence over hid-multitouch, the usual way of adding it to hid_have_special_driver will work as the quirk HID_QUIRK_MULTITOUCH won't be set by the generic hid layer. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: fix handling of buggy reports descriptors for Dell ST2220TBenjamin Tissoires2012-03-121-39/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | LG multitouch panels, such as the one found in Dell ST2220T, has buggy reports descriptors. With the previous implementation, it was impossible to rely on the reports descriptors to determine how the different touches are emitted from the device. This patch changes the splitting of the different touches in the report in a more robust way. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add support for eGalax 0x722aBenjamin Tissoires2012-03-091-0/+3
| | | | | | | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add more eGalax devicesBenjamin Tissoires2012-03-061-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is a list of devices that should be handled by hid-multitouch. They all present the HID usage "Contact ID" and won't be handled by hid-input. Some of them have _not_ been tested (though I have their report descriptors), but I've been guaranted by eeti that they follow the same protocol. The tested ones are also blacklisted in hid-core.c. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add new PID from IdeacomBenjamin Tissoires2012-03-061-0/+3
| | | | | | | | | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add support for Atmel maXTouch 03eb:2118Benjamin Tissoires2012-03-061-0/+3
| | | | | | | | | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add support of Panasonic multitouch panelsDenis Kovalev2012-02-211-4/+15
| | | | | | | | | | | | | | While at it, also fix some minor codingstyle issues. Signed-off-by: Denis Kovalev <Denis.Kovalev@dataart.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: support Perixx PERIPAD 701Benjamin Tissoires2012-02-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perixx Peripad 701 is an hybrid device which presents a touchpad and a keyboard on the same surface. The switch between the two is controlled by a physical switch, and the firmware sends the events on the right interface (mouse, keyboard or multitouch). This patch enables the multitouch interface of this device to work. We need to manually set the device as a trackpad (we cannot infer it from the reports descriptors as the device works under Windows, a system that does not allow multitouch touchpad). We also need to set the hid feature MAX CONTACT NUMBER to 2 or the device stops sending events once it has been pressed by two touches. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add control of the feature "Maximum Contact Number"Benjamin Tissoires2012-02-061-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices, like Perixx Peripad 701 do not work if the feature "Maximum Contact Number" is not set to the right value. This patch allows hid-multitouch to control this feature. If the programmer fills the field maxcontacts in the mt_class, then the driver will set the feature to this value. It is safe for current drivers as the feature is read/write in the HID norm and all devices should implement the norm. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | HID: multitouch: add support for trackpadsBenjamin Tissoires2012-02-061-6/+34
|/ | | | | | | | | | | | | * some multitouch trackpads present the touch usage. This needs to be filtered as it will conflict with mt-implementation. * trackpads send BTN_TOOL_* to notify how many fingers are present (this is used by xorg to use synaptics instead of generic evdev) * trackpads like Perixx 701 are not different from a hid point of view from a touchscreen, and we need to manually set them as touchpad. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
*-. Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', ↵Jiri Kosina2012-01-051-44/+169
|\ \ | | | | | | | | | 'upstream-fixes', 'wacom' and 'wiimote' into for-linus
| | * HID: multitouch: make struct mt_classess staticJiri Kosina2011-11-221-1/+1
| |/ |/| | | | | Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: hid-multitouch: add support 9 new Xiroku devicesMasatoshi Hoshikawa2012-01-051-0/+29
| | | | | | | | | | | | | | This patch adds support for the Xiroku Inc. panels (SPX/MPX/CSR/etc.). Signed-off-by: Masatoshi Hoshikawa <hoshikawa@xiroku.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: add support for 3M 32"Benjamin Tissoires2012-01-021-0/+3
| | | | | | | | | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: add support of Atmel multitouch panelsBenjamin Tissoires2012-01-021-0/+5
| | | | | | | | | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: support PixArt optical touch screenAaron Tian2011-12-151-0/+15
| | | | | | | | | | | | | | | | | | This patch modifies hid-multitouch driver for supporting PixArt optical touch screen. Because of the device does not have to set initial report, we apply "HID_QUIRK_NO_INIT_REPORTS" quirk and add the device into hid_blacklist[] Signed-off-by: Aaron Tian <aaron_tian@pixart.com.tw> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: hid-multitouch: add support for new Hanvon panelsBenjamin Tissoires2011-11-301-0/+5
| | | | | | | | | | | | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: merge quanta driver into hid-multitouchBenjamin Tissoires2011-11-301-4/+19
| | | | | | | | | | | | | | | | | | | | This patch merge the last old-style hid multitouch driver to the generic one. It also adds 2 more quanta pids. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: correct eGalax a001 protocolBenjamin Tissoires2011-11-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | This device use another protocol while sending the events. It's the same as the one described as "serial" by Microsoft. We are keeping here the sn_move and sn_pressure parameters for egalax devices. CC: Cedric Sodhi <manday@gmx.net> CC: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: add support for the MSI Windpad 110WBenjamin Tissoires2011-11-231-0/+3
| | | | | | | | | | | | | | | | | | Just another eGalax device. Please note that adding this device to have_special_driver in hid-core.c is not required anymore. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: Add egalax ID for Acer Iconia W500Marek Vasut2011-11-231-0/+3
| | | | | | | | | | | | | | | | | | | | This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel supports up to five fingers, therefore the need for a new addition of panel types. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: cleanup with eGalax PID definitionsBenjamin Tissoires2011-11-231-12/+12
| | | | | | | | | | | | | | | | | | This is just a renaming of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH{N} to USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_{PID} to handle more eGalax devices. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: remove .maxcontacts field for eGalaxBenjamin Tissoires2011-11-231-1/+0
| | | | | | | | | | | | | | | | Some eGalax devices are 4 or 5 fingers touches, wereas others are 2. This patch removes the limit in which all eGalax presents 2 touches. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * HID: multitouch: cleanup eGalax quirksBenjamin Tissoires2011-11-231-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation of eGalax protocol was not satisfying as we had to manually set x/y ranges as they were corrupted after reading the report descriptor. Indeed, the report descriptor provided a stylus input interface which override the correct values. This patch omits this input, thus leaving the correct value untouched, and the MT_QUIRK_EGALAX_XYZ_FIXUP not required anymore. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>