Commit 22a3b977 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: (31 commits)
  HID: fix support for Microsoft comfort mouse 4500
  HID: hid-multitouch: add one new multitouch device's VID/PID
  HID: prodikeys: remove a redundant forward declaration of struct pcmidi_snd
  HID: prodikeys: make needlessly global symbols static
  HID: emsff: properly handle emsff_init failure
  HID: ACRUX - add missing hid_hw_stop() in ax_probe() error path
  HID: fix horizontal wheel for ms comfort mouse 4500
  HID: uclogic: Add support for UC-Logic WP1062
  HID: wiimote: Add sysfs support to wiimote driver
  HID: wiimote: Cache wiimote led state
  HID: wiimote: Add wiimote led request
  HID: wiimote: Add wiimote input button parser
  HID: wiimote: Add wiimote event handler
  HID: wiimote: Add output queue for wiimote driver
  HID: wiimote: Add wiimote send function
  HID: wiimote: Synchronize wiimote input and hid event handling
  HID: wiimote: Register input device in wiimote hid driver
  HID: wiimote: Add wiimote device structure
  HID: wiimote: Register wiimote hid driver stub
  HID: wiimote: Add Nintendo Wii Remote driver stub
  ...
parents acb41c0f a91f423e

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

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ 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>/talk

Date:		May 2011

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

Description:	Used to active some easy* functions of the mouse from outside.

		The data has to be 16 bytes long.

		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>/tcu

Date:		October 2010

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

Documentation/ABI/testing/sysfs-driver-hid-wiimote

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/bus/hid/drivers/wiimote/<dev>/led1

What:		/sys/bus/hid/drivers/wiimote/<dev>/led2

What:		/sys/bus/hid/drivers/wiimote/<dev>/led3

What:		/sys/bus/hid/drivers/wiimote/<dev>/led4

Date:		July 2011

KernelVersion:	3.1

Contact:	David Herrmann <dh.herrmann@googlemail.com>

Description:	Make it possible to set/get current led state. Reading from it

		returns 0 if led is off and 1 if it is on. Writing 0 to it

		disables the led, writing 1 enables it.

drivers/hid/Kconfig

+34 −10
Original line number Diff line number Diff line
@@ -172,6 +172,20 @@ config HID_EZKEY 
	---help---

	Support for Ezkey BTC 8193 keyboard.



config HID_HOLTEK

	tristate "Holtek On Line Grip based game controller support"

	depends on USB_HID

	---help---

	  Say Y here if you have a Holtek On Line Grip based game controller.



config HOLTEK_FF

	bool "Holtek On Line Grip force feedback support"

	depends on HID_HOLTEK

	select INPUT_FF_MEMLESS

	---help---

	  Say Y here if you have a Holtek On Line Grip based game controller

	  and want to have force feedback support for it.



config HID_KEYTOUCH

	tristate "Keytouch HID devices"

	depends on USB_HID
@@ -322,6 +336,7 @@ config HID_MULTITOUCH 
	  - Stantum multitouch panels

	  - Touch International Panels

	  - Unitec Panels

	  - XAT optical touch panels



	  If unsure, say N.
@@ -435,6 +450,7 @@ config HID_QUANTA 
config HID_ROCCAT

	tristate "Roccat special event support"

	depends on USB_HID

	select HID_ROCCAT_COMMON

	---help---

	Support for Roccat special events.

	Say Y here if you have a Roccat mouse or keyboard and want OSD or
@@ -442,44 +458,40 @@ config HID_ROCCAT 


config HID_ROCCAT_COMMON

	tristate

	depends on HID_ROCCAT



config HID_ROCCAT_ARVO

	tristate "Roccat Arvo keyboard support"

	depends on USB_HID

	select HID_ROCCAT

	select HID_ROCCAT_COMMON

	depends on HID_ROCCAT

	---help---

	Support for Roccat Arvo keyboard.



config HID_ROCCAT_KONE

	tristate "Roccat Kone Mouse support"

	depends on USB_HID

	select HID_ROCCAT

	select HID_ROCCAT_COMMON

	depends on HID_ROCCAT

	---help---

	Support for Roccat Kone mouse.



config HID_ROCCAT_KONEPLUS

	tristate "Roccat Kone[+] mouse support"

	depends on USB_HID

	select HID_ROCCAT

	select HID_ROCCAT_COMMON

	depends on HID_ROCCAT

	---help---

	Support for Roccat Kone[+] mouse.



config HID_ROCCAT_KOVAPLUS

	tristate "Roccat Kova[+] mouse support"

	depends on USB_HID

	select HID_ROCCAT

	select HID_ROCCAT_COMMON

	depends on HID_ROCCAT

	---help---

	Support for Roccat Kova[+] mouse.



config HID_ROCCAT_PYRA

	tristate "Roccat Pyra mouse support"

	depends on USB_HID

	select HID_ROCCAT

	select HID_ROCCAT_COMMON

	depends on HID_ROCCAT

	---help---

	Support for Roccat Pyra mouse.
@@ -495,6 +507,12 @@ config HID_SONY 
	---help---

	Support for Sony PS3 controller.



config HID_SPEEDLINK

	tristate "Speedlink VAD Cezanne mouse support"

	depends on USB_HID

	---help---

	Support for Speedlink Vicious and Divine Cezanne mouse.



config HID_SUNPLUS

	tristate "Sunplus wireless desktop"

	depends on USB_HID
@@ -568,6 +586,12 @@ config HID_WACOM_POWER_SUPPLY 
	  Say Y here if you want to enable power supply status monitoring for

	  Wacom Bluetooth devices.



config HID_WIIMOTE

	tristate "Nintendo Wii Remote support"

	depends on BT_HIDP

	---help---

	Support for the Nintendo Wii Remote bluetooth device.



config HID_ZEROPLUS

	tristate "Zeroplus based game controller support"

	depends on USB_HID

drivers/hid/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o 
obj-$(CONFIG_HID_ELECOM)	+= hid-elecom.o

obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o

obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o

obj-$(CONFIG_HID_HOLTEK)	+= hid-holtekff.o

obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o

obj-$(CONFIG_HID_KEYTOUCH)	+= hid-keytouch.o

obj-$(CONFIG_HID_KYE)		+= hid-kye.o
@@ -63,6 +64,7 @@ obj-$(CONFIG_HID_ROCCAT_PYRA) += hid-roccat-pyra.o 
obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o

obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o

obj-$(CONFIG_HID_SONY)		+= hid-sony.o

obj-$(CONFIG_HID_SPEEDLINK)	+= hid-speedlink.o

obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o

obj-$(CONFIG_HID_GREENASIA)	+= hid-gaff.o

obj-$(CONFIG_HID_THRUSTMASTER)	+= hid-tmff.o
@@ -73,6 +75,7 @@ obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o 
obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o

obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o

obj-$(CONFIG_HID_WALTOP)	+= hid-waltop.o

obj-$(CONFIG_HID_WIIMOTE)	+= hid-wiimote.o



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

drivers/hid/hid-axff.c

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	error = hid_hw_open(hdev);

	if (error) {

		dev_err(&hdev->dev, "hw open failed\n");

		hid_hw_stop(hdev);

		return error;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE