Commit ee9ec4f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)
  HID: hid-multitouch: cosmetic changes, sort classes and devices
  HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
  HID: hid-multitouch: add support for Unitec panels
  HID: hid-multitouch: add support for Touch International panels
  HID: hid-multitouch: add support for GoodTouch panels
  HID: hid-multitouch: add support for CVTouch panels
  HID: hid-multitouch: add support for ActionStar panels
  HID: hiddev: fix race between hiddev_disconnect and hiddev_release
  HID: magicmouse: ignore 'ivalid report id' while switching modes
  HID: fix a crash in hid_report_raw_event() function.
  HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
  HID: assorted usage updates from hut 1.12
  HID: roccat: fix actual/startup profile sysfs attribute in koneplus
  HID: hid-multitouch: Add support for Lumio panels
  HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
  HID: hid-multitouch: add support for Ilitek dual-touch panel
  HID: picolcd: Avoid compile warning/error triggered by copy_from_user()
  HID: add support for Logitech G27 wheel
  HID: hiddev: fix error path in hiddev_read when interrupted
  HID: add support for Sony Navigation Controller
  ...
parents e0c6b8a1 366a2382

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile

Date:		October 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The integer value of this attribute ranges from 0-4.

                When read, this attribute returns the number of the actual

                profile. This value is persistent, so its equivalent to the

                profile that's active when the mouse is powered on next time.

		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.

		Please use actual_profile, it does the same thing.

Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus

+6 −13
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/actual_profile

Date:		October 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When read, this file returns the number of the actual profile in

		range 0-4.

		This file is readonly.

Description:	The integer value of this attribute ranges from 0-4.

                When read, this attribute returns the number of the actual

                profile. This value is persistent, so its equivalent to the

                profile that's active when the mouse is powered on next time.

		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/firmware_version
@@ -89,16 +92,6 @@ Description: The mouse has a tracking- and a distance-control-unit. These 
		This file is writeonly.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile

Date:		October 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The integer value of this attribute ranges from 0-4.

                When read, this attribute returns the number of the profile

                that's active when the mouse is powered on.

		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu

Date:		October 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Documentation/hid/hidraw.txt

0 → 100644
+119 −0
Original line number Diff line number Diff line 
      HIDRAW - Raw Access to USB and Bluetooth Human Interface Devices

     ==================================================================



The hidraw driver provides a raw interface to USB and Bluetooth Human

Interface Devices (HIDs).  It differs from hiddev in that reports sent and

received are not parsed by the HID parser, but are sent to and received from

the device unmodified.



Hidraw should be used if the userspace application knows exactly how to

communicate with the hardware device, and is able to construct the HID

reports manually.  This is often the case when making userspace drivers for

custom HID devices.



Hidraw is also useful for communicating with non-conformant HID devices

which send and receive data in a way that is inconsistent with their report

descriptors.  Because hiddev parses reports which are sent and received

through it, checking them against the device's report descriptor, such

communication with these non-conformant devices is impossible using hiddev.

Hidraw is the only alternative, short of writing a custom kernel driver, for

these non-conformant devices.



A benefit of hidraw is that its use by userspace applications is independent

of the underlying hardware type.  Currently, Hidraw is implemented for USB

and Bluetooth.  In the future, as new hardware bus types are developed which

use the HID specification, hidraw will be expanded to add support for these

new bus types.



Hidraw uses a dynamic major number, meaning that udev should be relied on to

create hidraw device nodes.  Udev will typically create the device nodes

directly under /dev (eg: /dev/hidraw0).  As this location is distribution-

and udev rule-dependent, applications should use libudev to locate hidraw

devices attached to the system.  There is a tutorial on libudev with a

working example at:

	http://www.signal11.us/oss/udev/



The HIDRAW API

---------------



read()

-------

read() will read a queued report received from the HID device. On USB

devices, the reports read using read() are the reports sent from the device

on the INTERRUPT IN endpoint.  By default, read() will block until there is

a report available to be read.  read() can be made non-blocking, by passing

the O_NONBLOCK flag to open(), or by setting the O_NONBLOCK flag using

fcntl().



On a device which uses numbered reports, the first byte of the returned data

will be the report number; the report data follows, beginning in the second

byte.  For devices which do not use numbered reports, the report data

will begin at the first byte.



write()

--------

The write() function will write a report to the device. For USB devices, if

the device has an INTERRUPT OUT endpoint, the report will be sent on that

endpoint. If it does not, the report will be sent over the control endpoint,

using a SET_REPORT transfer.



The first byte of the buffer passed to write() should be set to the report

number.  If the device does not use numbered reports, the first byte should

be set to 0. The report data itself should begin at the second byte.



ioctl()

--------

Hidraw supports the following ioctls:



HIDIOCGRDESCSIZE: Get Report Descriptor Size

This ioctl will get the size of the device's report descriptor.



HIDIOCGRDESC: Get Report Descriptor

This ioctl returns the device's report descriptor using a

hidraw_report_descriptor struct.  Make sure to set the size field of the

hidraw_report_descriptor struct to the size returned from HIDIOCGRDESCSIZE.



HIDIOCGRAWINFO: Get Raw Info

This ioctl will return a hidraw_devinfo struct containing the bus type, the

vendor ID (VID), and product ID (PID) of the device. The bus type can be one

of:

	BUS_USB

	BUS_HIL

	BUS_BLUETOOTH

	BUS_VIRTUAL

which are defined in linux/input.h.



HIDIOCGRAWNAME(len): Get Raw Name

This ioctl returns a string containing the vendor and product strings of

the device.  The returned string is Unicode, UTF-8 encoded.



HIDIOCGRAWPHYS(len): Get Physical Address

This ioctl returns a string representing the physical address of the device.

For USB devices, the string contains the physical path to the device (the

USB controller, hubs, ports, etc).  For Bluetooth devices, the string

contains the hardware (MAC) address of the device.



HIDIOCSFEATURE(len): Send a Feature Report

This ioctl will send a feature report to the device.  Per the HID

specification, feature reports are always sent using the control endpoint.

Set the first byte of the supplied buffer to the report number.  For devices

which do not use numbered reports, set the first byte to 0. The report data

begins in the second byte. Make sure to set len accordingly, to one more

than the length of the report (to account for the report number).



HIDIOCGFEATURE(len): Get a Feature Report

This ioctl will request a feature report from the device using the control

endpoint.  The first byte of the supplied buffer should be set to the report

number of the requested report.  For devices which do not use numbered

reports, set the first byte to 0.  The report will be returned starting at

the first byte of the buffer (ie: the report number is not returned).



Example

---------

In samples/, find hid-example.c, which shows examples of read(), write(),

and all the ioctls for hidraw.  The code may be used by anyone for any

purpose, and can serve as a starting point for developing applications using

hidraw.



Document by:

	Alan Ott <alan@signal11.us>, Signal 11 Software

drivers/hid/Kconfig

+15 −27
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ source "drivers/hid/usbhid/Kconfig" 
menu "Special HID drivers"

	depends on HID



config HID_3M_PCT

	tristate "3M PCT touchscreen"

	depends on USB_HID

	---help---

	Support for 3M PCT touch screens.



config HID_A4TECH

	tristate "A4 tech mice" if EXPERT

	depends on USB_HID
@@ -100,12 +94,6 @@ config HID_BELKIN 
	---help---

	Support for Belkin Flip KVM and Wireless keyboard.



config HID_CANDO

	tristate "Cando dual touch panel"

	depends on USB_HID

	---help---

	Support for Cando dual touch panel.



config HID_CHERRY

	tristate "Cherry Cymotion keyboard" if EXPERT

	depends on USB_HID
@@ -300,12 +288,6 @@ config HID_MICROSOFT 
	---help---

	Support for Microsoft devices that are not fully compliant with HID standard.



config HID_MOSART

	tristate "MosArt dual-touch panels"

	depends on USB_HID

	---help---

	Support for MosArt dual-touch panels.



config HID_MONTEREY

	tristate "Monterey Genius KB29E keyboard" if EXPERT

	depends on USB_HID
@@ -320,13 +302,25 @@ config HID_MULTITOUCH 
	  Generic support for HID multitouch panels.



	  Say Y here if you have one of the following devices:

	  - 3M PCT touch screens

	  - ActionStar dual touch panels

	  - Cando dual touch panels

	  - CVTouch panels

	  - Cypress TrueTouch panels

	  - Elo TouchSystems IntelliTouch Plus panels

	  - GeneralTouch 'Sensing Win7-TwoFinger' panels

	  - GoodTouch panels

	  - Hanvon dual touch panels

	  - Ilitek dual touch panels

	  - IrTouch Infrared USB panels

	  - Lumio CrystalTouch panels

	  - MosArt dual-touch panels

	  - PenMount dual touch panels

	  - Pixcir dual touch panels

	  - 'Sensing Win7-TwoFinger' panel by GeneralTouch

          - eGalax dual-touch panels, including the

	    Joojoo and Wetab tablets

	  - eGalax dual-touch panels, including the Joojoo and Wetab tablets

	  - Stantum multitouch panels

	  - Touch International Panels

	  - Unitec Panels



	  If unsure, say N.
@@ -500,12 +494,6 @@ config HID_SONY 
	---help---

	Support for Sony PS3 controller.



config HID_STANTUM

	tristate "Stantum multitouch panel"

	depends on USB_HID

	---help---

	Support for Stantum multitouch panel.



config HID_SUNPLUS

	tristate "Sunplus wireless desktop"

	depends on USB_HID

CRA Git | Maintained and supported by SUSTech CRA and CCSE