summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-03-17Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', ↵Jiri Kosina
'roccat', 'upstream' and 'upstream-fixes' into for-linus
2011-03-16HID: add support for Logitech Driving Force Pro wheelJiri Kosina
Add force feedback support for Logitech Driving Force Pro wheel. Device IDs reported by Michal Malý. Reported-by: Michal Malý <madcatxster@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-16HID: hid-ortek: remove spurious referenceJiri Kosina
Remove spurious bugzilla reference from the source comment header. Also fix the comment to be more correct (it's HID report descriptor rather than USB). Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-16HID: add support for Ortek PKB-1700Herton Ronaldo Krzesinski
As reported on http://ubuntuforums.org/showthread.php?t=1594007 the PKB-1700 needs same special handling as WKB-2000. This change is originally based on patch posted by user asmoore82 on the Ubuntu forums. Cc: stable@kernel.org Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-15HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'Stefan Achatz
Mode of sysfs attribute 'sensor' was wrongly set to writeonly. Corrected this to readwrite. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-14HID: hid-ntrig: init settle and mode checkRafi Rubin
Adding a wait before the wakeup signal. As a precautionary measure sanity check the current sensor mode. If needed reset it to "dual". When the device is responding poorly and needs the wakeup call, it was missing it. Giving it a chance to settle first improves the chances that signal gets through. Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu> Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-14HID: merge hid-egalax into hid-multitouchRichard Nauber
This patch merges the hid-egalax driver into hid-multitouch. There are two types of devices support by the hid-egalax driver: resistive and capacitive. Here, they are implicitly distinguished by the absence of a HID_DG_CONTACTCOUNT field in the latter, so no special code path needs to be introduced. As a side effect, this patch fixes the broken suspend/resume behavior in the old driver. [rydberg@euromail.se: minor fixups] Signed-off-by: Richard Nauber <Richard.Nauber@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-14HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missingHenrik Rydberg
The recent capacitive DWAV firmwares do not use the CONTACTCOUNT field, and the touch frame boundary can therefore not be determined. This patch makes the driver report the touch frame at each completed slot instead. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-14HID: ntrig remove if and drop an indentRafi Rubin
Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu> Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-12HID: ACRUX - activate the device immediately after bindingDmitry Torokhov
This device does not tolerate delayed opening and goes into a coma if we try to that. Ubuntu even has a crutch for udev that opened the device upon seeing it for the first time, but it did not work if we happened to boot with the device attached, since by the time userspace got around opening the device it was too late. Let's start the device immediately to deal with this issue. Reported-by: Sergei Kolzun <x0r@dv-life.ru> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-10HID: ntrig: apply NO_INIT_REPORTS quirkRafi Rubin
Probing reports does bad things with some ntrig firmwares, better to just leave them alone. Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-09HID: hid-magicmouse: Correct touch orientation directionHenrik Rydberg
The magic trackpad and mouse both report touch orientation in opposite direction to the bcm5974 driver and what is written in Documents/input/multi-touch-protocol.txt. This patch reverts the direction, so that all in-kernel devices with this feature behave the same way. Since no known application has been utilizing this information yet, it seems appropriate also for stable. Cc: stable@kernel.org Cc: Michael Poole <mdpoole@troilus.org> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-08HID: ntrig don't dereference unclaimed hidinputRafi Rubin
Check before dereferencing field->hidinput to fix a reported invalid deference bug. Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-03-01HID: Do not create input devices for feature reportsHenrik Rydberg
When the multi input quirk is set, there is a new input device created for every feature report. Since the idea is to present features per hid device, not per input device, revert back to the original report loop and change the feature_mapping() callback to not take the input device as argument. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Tested-by: Benjamin Tissoires <benjmain.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-22HID: bt hidp: send Output reports using SET_REPORT on the Control channelAntonio Ospite
The current implementation of hidp_output_raw_report() relies only on the Control channel even for Output reports, and the BT HID specification [1] does not mention using the DATA message for Output reports on the Control channel (see section 7.9.1 and also Figure 11: SET_ Flow Chart), so let us just use SET_REPORT. This also fixes sending Output reports to some devices (like Sony Sixaxis) which are not able to handle DATA messages on the Control channel. Ideally hidp_output_raw_report() could be improved to use this scheme: Feature Report -- SET_REPORT on the Control channel Output Report -- DATA on the Interrupt channel for more efficiency, but as said above, right now only the Control channel is used. [1] http://www.bluetooth.com/Specification%20Documents/HID_SPEC_V10.pdf Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-21HID: hid-sony.c: Fix sending Output reports to the SixaxisAntonio Ospite
The Sixaxis does not want the report_id as part of the data packet in Output reports, so we have to discard buf[0] when sending the actual control message. Add also some documentation about that and about why hdev->hid_output_raw_report needs to be overridden. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-17HID: add support for Keytouch IEC 60945Jiri Kosina
The keyboard has several bugs in its report descriptor, most importantly the Logical Min/Max are completely off. Replace it with simplified descriptor which describes it properly. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-17HID: Add HID Report Descriptor to sysfsAlan Ott
Add a new binary sysfs entry called report_descriptor which contains the HID report descriptor. Signed-off-by: Alan Ott <alan@signal11.us> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-16HID: add IRTOUCH infrared USB to hid_have_special_driverBenjamin Tissoires
Without this patch, the device is handled by hidinput and does not have the right behavior. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-15HID: kernel oops in out_cleanup in function hidinput_connectBenjamin Tissoires
Goto out_cleanup infers a kernel oops: hidinput_disconnect calls input_unregister_driver to all members of hid->inputs. However, hidinput already has been added to hid->inputs even though input_register_device was not called. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Reviewed-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-15HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)Steffen Barszus
This patch adds support for 5 keys which can be found only on the EU version of the gyration remote, which has been not mapped before. Signed-off-by: Steffen Barszus <steffenbpunkt[AT]googlemail[DOT]com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-13HID: hid-lcpower: fix key mappingChris Schlund
I already got some feedback for this module, telling me red and blue keys are exchanged. I checked it, and they are right. Due to my incorrect userspace settings I missed this during my testing. Signed-off-by: Chris Schlund <chrisschlund@gmx.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-11HID: bt: Add support for hidraw HIDIOCGFEATURE and HIDIOCSFEATUREAlan Ott
This patch adds support or getting and setting feature reports for bluetooth HID devices from HIDRAW. Signed-off-by: Alan Ott <alan@signal11.us> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-11HID: Add Support for Setting and Getting Feature Reports from hidrawAlan Ott
Per the HID Specification, Feature reports must be sent and received on the Configuration endpoint (EP 0) through the Set_Report/Get_Report interfaces. This patch adds two ioctls to hidraw to set and get feature reports to and from the device. Modifications were made to hidraw and usbhid. New hidraw ioctls: HIDIOCSFEATURE - Perform a Set_Report transfer of a Feature report. HIDIOCGFEATURE - Perform a Get_Report transfer of a Feature report. Signed-off-by: Alan Ott <alan@signal11.us> Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-11HID: bt: Wait for ACK on Sent ReportsAlan Ott
Wait for an ACK from the device before returning from hidp_output_raw_report(). This way, failures can be returned to the user application. Also, it prevents ACK/NAK packets from an output packet from being confused with ACK/NAK packets from an input request packet. Signed-off-by: Alan Ott <alan@signal11.us> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-11HID: bt: Move hid_add_device() call to after hidp_session() has started.Alan Ott
Move the call to hid_add_device() (which calls a device's probe() function) to after the kernel_thread() call which starts the hidp_session() thread. This ensures the Bluetooth receive socket is fully running by the time a device's probe() function is called. This way, a device can communicate (send and receive) with the Bluetooth device from its probe() function. Signed-off-by: Alan Ott <alan@signal11.us> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Add 'Users:' tag to sysfs documentationStefan Achatz
Added 'Users:' tag to sysfs documentation of roccat device drivers pointing to project website at sourceforge. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: add support for wireless remote LC Power model RC1000MCEChris Schlund
Signed-off-by: Chris Schlund <chrisschlund@gmx.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Rename header roccat.h -> hid-roccat.hStefan Achatz
It was desired that the header roccat.h should be named hid-roccat.h Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Fix bug that prevented roccat chardev from removing devicesStefan Achatz
pointer to device was cleared too early. This is fixed now. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Fix NULL pointer dereference when unloading moduleStefan Achatz
Class was destroyed before starting the unregistering driver chain. Disconnecting a device from roccat chardev in this process then raised a NULL pointer dereference. Fixed this by destroying class after unregistering driver. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Add ioctl command to retreive report size from chardevStefan Achatz
Roccat chardev was reworked to support only a defined report size per device and this can be retreived by an ioctl now to enable future changes in report definitions. Header was moved/renamed from drivers/hid to include/linux for accessibility. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Increase waiting time for Kone[+] to prevent occasional freezesStefan Achatz
On newer kernels the device freezes occasionally on initialization with just 70msec between reads. Increased this value to safe 100msec. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Add support for Kova[+] mouseStefan Achatz
This patch adds support for Roccat Kova[+] mouse. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Introduce module hid-roccat-commonStefan Achatz
Module hid-roccat-common contains functions used by roccat device driver modules to reduce code duplication. At the moment it contains just two wrapper methods for usb_control_msg that ensure that the buffer used for transfer is dma capable which wasn't the case before. The kconfig option is not visible to the user but will be selected by the device specific drivers. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Use new hid_err macrosStefan Achatz
Using the new hid_err macros instead of dev_err. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-03HID: roccat: Remove empty function definitions for roccat chardevStefan Achatz
Roccat chardev is a dependency of all device specific drivers, so the empty definitions are not needed anymore. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-01HID: hidraw: fix hidraw_disconnect()Stefan Achatz
hidraw_disconnect() first sets an entry in hidraw_table to NULL and calls device_destroy() afterwards. The thereby called hidraw_release() tries to read this already cleared value resulting in never removing any device from the list. This got fixed by changing the order of events. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-01HID: update dragonrise Kconfig descriptionNikolai Kondrashov
Add list of (supposedly) supported gamepads to dragonrise driver Kconfig description. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-01HID: add support for DragonRise PID 0011 gamepadNikolai Kondrashov
Add support for DragonRise Inc. gamepad with USB PID 0x0011 by fixing its report descriptor. This mainly removes spurious axis. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-02-01HID: rename hid-drff.c to hid-dr.cNikolai Kondrashov
Rename drivers/hid/hid-drff.c (a DragonRise Inc. force feedback gamepad driver) to driver/hid/hid-dr.c. This prepares it for addition of support for another gamepad, without force feedback. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-31HID: hidraw: Replace Confusing += Operator with =Alan Ott
Setting of the return value of hidraw_read() uses the += operator when = is more appropriate. There is no case where ret can be anything other than zero when the assignment is made, making = equivalent to += and much more clear. Signed-off-by: Alan Ott <alan@signal11.us> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-31HID: hid-multitouch: introduce IrTouch Infrared USB deviceBenjamin Tissoires
This patch adds support for IrTouch 42 inches. Tested-by: Victor Zhuk <v.zhuk@acs-ltd.ru> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-31HID: hid-multitouch: add Benjamin Tissoires as module_authorBenjamin Tissoires
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-31HID: hid-multitouch: Rename MT_CLS_DUAL1 and MT_CLS_DUAL2Benjamin Tissoires
This patch renames MT_CLS_DUAL1 to MT_CLS_DUAL_INRANGE_CONTACTID and MT_CLS_DUAL2 to MT_CLS_DUAL_INRANGE_CONTACTNUMBER for better readability. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-31HID: hid-multitouch: change default mt_classBenjamin Tissoires
The safest quirk for a device (the one that works out of the box for most of them) is MT_QUIRK_NOT_SEEN_MEANS_UP. Indeed, it does not make any assumption on the device. When adding a new device, we can easily test it against MT_CLS_DEFAULT, and then optimize it with other quirks: that's why no device use MT_CLS_DEFAULT right now. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-20HID: roccat: Fix an error message when reading more data from bin attributesStefan Achatz
Using cat or something to read from binary attributes would try to do an additional read with offset equal to filesize. This resulted in an invalid attribute error. This is fixed by giving the right answer instead of EINVAL. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-20HID: roccat: Add support for Roccat Arvo keyboardStefan Achatz
This patch add support for Roccat Arvo keyboard. Arvo has 5 additional configurable buttons and the ability to deactivate certain keys. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-17HID: hid-roccat-koneplus: potential NULL dereferenceVasiliy Kulikov
kmalloc() may fail, if so return -ENOMEM. Also koneplus_init_koneplus_device_struct() should check return code of koneplus_get_startup_profile() and propagate its return code. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-01-13Merge branch 'release' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix format warning in arch/ia64/kernel/acpi.c
generated by cgit v0.10.2 at 2024-09-18 08:45:58 (GMT)