Commit 8b108c60 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: (59 commits)
  HID: fix up 'EMBEDDED' mess in Kconfig
  HID: roccat: cleanup preprocessor macros
  HID: roccat: refactor special event handling
  HID: roccat: fix special button support
  HID: roccat: Correctly mark init and exit functions
  HID: hidraw: Use Interrupt Endpoint for OUT Transfers if Available
  HID: hid-samsung: remove redundant key mappings
  HID: add omitted hid-zydacron.c file
  HID: hid-samsung: add support for Creative Desktop Wireless 6000
  HID: picolcd: Eliminate use after free
  HID: Zydacron Remote Control driver
  HID: Use kmemdup
  HID: magicmouse: fix input registration
  HID: make Prodikeys driver standalone config option
  HID: Prodikeys PC-MIDI HID Driver
  HID: hidraw: fix indentation
  HID: ntrig: add filtering module parameters
  HID: ntrig: add sysfs access to filter parameters
  HID: ntrig: add sensitivity and responsiveness support
  HID: add multi-input quirk for eGalax Touchcontroller
  ...
parents 7ce1418f 73d5e8f7

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

0 → 100644
+43 −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>/operation_mode

Date:		March 2010

Contact:	Bruno Prémont <bonbons@linux-vserver.org>

Description:	Make it possible to switch the PicoLCD device between LCD

		(firmware) and bootloader (flasher) operation modes.



		Reading: returns list of available modes, the active mode being

		enclosed in brackets ('[' and ']')



		Writing: causes operation mode switch. Permitted values are

		the non-active mode names listed when read.



		Note: when switching mode the current PicoLCD HID device gets

		disconnected and reconnects after above delay (see attribute

		operation_mode_delay for its value).





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

Date:		April 2010

Contact:	Bruno Prémont <bonbons@linux-vserver.org>

Description:	Delay PicoLCD waits before restarting in new mode when

		operation_mode has changed.



		Reading/Writing: It is expressed in ms and permitted range is

		0..30000ms.





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

Date:		March 2010

Contact:	Bruno Prémont <bonbons@linux-vserver.org>

Description:	Make it possible to adjust defio refresh rate.



		Reading: returns list of available refresh rates (expressed in Hz),

		the active refresh rate being enclosed in brackets ('[' and ']')



		Writing: accepts new refresh rate expressed in integer Hz

		within permitted rates.



		Note: As device can barely do 2 complete refreshes a second

		it only makes sense to adjust this value if only one or two

		tiles get changed and it's not appropriate to expect the application

		to flush it's tiny changes explicitely at higher than default rate.

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
What:		/sys/bus/hid/drivers/prodikeys/.../channel

Date:		April 2010

KernelVersion:	2.6.34

Contact:	Don Prince <dhprince.devel@yahoo.co.uk>

Description:

		Allows control (via software) the midi channel to which

		that the pc-midi keyboard will output.midi data.

		Range: 0..15

		Type:  Read/write

What:		/sys/bus/hid/drivers/prodikeys/.../sustain

Date:		April 2010

KernelVersion:	2.6.34

Contact:	Don Prince <dhprince.devel@yahoo.co.uk>

Description:

		Allows control (via software) the sustain duration of a

		note held by the pc-midi driver.

		0 means sustain mode is disabled.

		Range: 0..5000 (milliseconds)

		Type:  Read/write

What:		/sys/bus/hid/drivers/prodikeys/.../octave

Date:		April 2010

KernelVersion:	2.6.34

Contact:	Don Prince <dhprince.devel@yahoo.co.uk>

Description:

		Controls the octave shift modifier in the pc-midi driver.

		The octave can be shifted via software up/down 2 octaves.

		0 means the no ocatve shift.

		Range: -2..2 (minus 2 to plus 2)

		Type: Read/Write

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

0 → 100644
+111 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/actual_dpi

Date:		March 2010

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

Description:	It is possible to switch the dpi setting of the mouse with the

		press of a button.

		When read, this file returns the raw number of the actual dpi

		setting reported by the mouse. This number has to be further

		processed to receive the real dpi value.



		VALUE DPI

		1     800

		2     1200

		3     1600

		4     2000

		5     2400

		6     3200



		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/actual_profile

Date:		March 2010

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

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

		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/firmware_version

Date:		March 2010

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

Description:	When read, this file returns the raw integer version number of the

		firmware reported by the mouse. Using the integer value eases

		further usage in other programs. To receive the real version

		number the decimal point has to be shifted 2 positions to the

		left. E.g. a returned value of 138 means 1.38

		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_driver_version

Date:		March 2010

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

Description:	When read, this file returns the driver version.

		The format of the string is "v<major>.<minor>.<patchlevel>".

		This attribute is used by the userland tools to find the sysfs-

		paths of installed kone-mice and determine the capabilites of

		the driver. Versions of this driver for old kernels replace

		usbhid instead of generic-usb. The way to scan for this file

		has been chosen to provide a consistent way for all supported

		kernel versions.

		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5]

Date:		March 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

                press of a button. A profile holds informations like button

                mappings, sensitivity, the colors of the 5 leds and light

                effects.

                When read, these files return the respective profile. The

                returned data is 975 bytes in size.

		When written, this file lets one write the respective profile

		data back to the mouse. The data has to be 975 bytes long.

		The mouse will reject invalid data, whereas the profile number

		stored in the profile doesn't need to fit the number of the

		store.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/settings

Date:		March 2010

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

Description:	When read, this file returns the settings stored in the mouse.

		The size of the data is 36 bytes and holds information like the

		startup_profile, tcu state and calibration_data.

		When written, this file lets write settings back to the mouse.

		The data has to be 36 bytes long. The mouse will reject invalid

		data.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/startup_profile

Date:		March 2010

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

Description:	The integer value of this attribute ranges from 1 to 5.

                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.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/tcu

Date:		March 2010

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

Description:	The mouse has a "Tracking Control Unit" which lets the user

		calibrate the laser power to fit the mousepad surface.

		When read, this file returns the current state of the TCU,

		where 0 means off and 1 means on.

		Writing 0 in this file will switch the TCU off.

		Writing 1 in this file will start the calibration which takes

		around 6 seconds to complete and activates the TCU.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/weight

Date:		March 2010

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

Description:	The mouse can be equipped with one of four supplied weights

		ranging from 5 to 20 grams which are recognized by the mouse

		and its value can be read out. When read, this file returns the

		raw value returned by the mouse which eases further processing

		in other software.

		The values map to the weights as follows:



		VALUE WEIGHT

		0     none

		1     5g

		2     10g

		3     15g

		4     20g



		This file is readonly.

Documentation/ABI/testing/sysfs-wacom

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/class/hidraw/hidraw*/device/speed

Date:		April 2010

Kernel Version:	2.6.35

Contact:	linux-bluetooth@vger.kernel.org

Description:

		The /sys/class/hidraw/hidraw*/device/speed file controls

		reporting speed of wacom bluetooth tablet. Reading from

		this file returns 1 if tablet reports in high speed mode

		or 0 otherwise. Writing to this file one of these values

		switches reporting speed.

drivers/hid/Kconfig

+121 −30
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ 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" if EMBEDDED

	depends on USB_HID
@@ -100,6 +106,21 @@ config HID_CHICONY 
	---help---

	Support for Chicony Tactical pad.



config HID_PRODIKEYS

	tristate "Prodikeys PC-MIDI Keyboard support"

	depends on USB_HID && SND

	select SND_RAWMIDI

	---help---

	Support for Prodikeys PC-MIDI Keyboard device support.

	Say Y here to enable support for this device.

	- Prodikeys PC-MIDI keyboard.

	  The Prodikeys PC-MIDI acts as a USB Audio device, with one MIDI

	  input and one MIDI output. These MIDI jacks appear as

	  a sound "card" in the ALSA sound system.

	  Note: if you say N here, this device will still function as a basic

	  multimedia keyboard, but will lack support for the musical keyboard

	  and some additional multimedia keys.



config HID_CYPRESS

	tristate "Cypress" if EMBEDDED

	depends on USB_HID
@@ -108,9 +129,8 @@ config HID_CYPRESS 
	Support for cypress mouse and barcode readers.



config HID_DRAGONRISE

	tristate "DragonRise Inc. support" if EMBEDDED

	tristate "DragonRise Inc. support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Say Y here if you have DragonRise Inc.game controllers.
@@ -122,6 +142,12 @@ config DRAGONRISE_FF 
	Say Y here if you want to enable force feedback support for DragonRise Inc.

	game controllers.



config HID_EGALAX

	tristate "eGalax multi-touch panel"

	depends on USB_HID

	---help---

	Support for the eGalax dual-touch panel.



config HID_EZKEY

	tristate "Ezkey" if EMBEDDED

	depends on USB_HID
@@ -137,16 +163,14 @@ config HID_KYE 
	Support for Kye/Genius Ergo Mouse.



config HID_GYRATION

	tristate "Gyration" if EMBEDDED

	tristate "Gyration"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Gyration remote control.



config HID_TWINHAN

	tristate "Twinhan" if EMBEDDED

	tristate "Twinhan"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Twinhan IR remote control.
@@ -233,16 +257,14 @@ config HID_NTRIG 
	Support for N-Trig touch screen.



config HID_ORTEK

	tristate "Ortek" if EMBEDDED

	tristate "Ortek"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.



config HID_PANTHERLORD

	tristate "Pantherlord support" if EMBEDDED

	tristate "Pantherlord support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	  Say Y here if you have a PantherLord/GreenAsia based game controller

	  or adapter.
@@ -256,29 +278,90 @@ config PANTHERLORD_FF 
	  or adapter and want to enable force feedback support for it.



config HID_PETALYNX

	tristate "Petalynx" if EMBEDDED

	tristate "Petalynx"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Petalynx Maxter remote control.



config HID_PICOLCD

	tristate "PicoLCD (graphic version)"

	depends on USB_HID

	---help---

	  This provides support for Minibox PicoLCD devices, currently

	  only the graphical ones are supported.



	  This includes support for the following device features:

	  - Keypad

	  - Switching between Firmware and Flash mode

	  - EEProm / Flash access     (via debugfs)

	  Features selectively enabled:

	  - Framebuffer for monochrome 256x64 display

	  - Backlight control

	  - Contrast control

	  - General purpose outputs

	  Features that are not (yet) supported:

	  - IR



config HID_PICOLCD_FB

	bool "Framebuffer support" if EMBEDDED

	default !EMBEDDED

	depends on HID_PICOLCD

	depends on HID_PICOLCD=FB || FB=y

	select FB_DEFERRED_IO

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select FB_SYS_FOPS

	---help---

	  Provide access to PicoLCD's 256x64 monochrome display via a

	  frambuffer device.



config HID_PICOLCD_BACKLIGHT

	bool "Backlight control" if EMBEDDED

	default !EMBEDDED

	depends on HID_PICOLCD

	depends on HID_PICOLCD=BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=y

	---help---

	  Provide access to PicoLCD's backlight control via backlight

	  class.



config HID_PICOLCD_LCD

	bool "Contrast control" if EMBEDDED

	default !EMBEDDED

	depends on HID_PICOLCD

	depends on HID_PICOLCD=LCD_CLASS_DEVICE || LCD_CLASS_DEVICE=y

	---help---

	  Provide access to PicoLCD's LCD contrast via lcd class.



config HID_PICOLCD_LEDS

	bool "GPO via leds class" if EMBEDDED

	default !EMBEDDED

	depends on HID_PICOLCD

	depends on HID_PICOLCD=LEDS_CLASS || LEDS_CLASS=y

	---help---

	  Provide access to PicoLCD's GPO pins via leds class.



config HID_QUANTA

	tristate "Quanta Optical Touch"

	depends on USB_HID

	---help---

	Support for Quanta Optical Touch dual-touch panels.



config HID_ROCCAT_KONE

	tristate "Roccat Kone Mouse support"

	depends on USB_HID

	---help---

	Support for Roccat Kone mouse.



config HID_SAMSUNG

	tristate "Samsung" if EMBEDDED

	tristate "Samsung"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Samsung InfraRed remote control.

	Support for Samsung InfraRed remote control or keyboards.



config HID_SONY

	tristate "Sony" if EMBEDDED

	tristate "Sony"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Sony PS3 controller.
@@ -289,16 +372,14 @@ config HID_STANTUM 
	Support for Stantum multitouch panel.



config HID_SUNPLUS

	tristate "Sunplus" if EMBEDDED

	tristate "Sunplus"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Sunplus wireless desktop.



config HID_GREENASIA

	tristate "GreenAsia (Product ID 0x12) support" if EMBEDDED

	tristate "GreenAsia (Product ID 0x12) support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	  Say Y here if you have a GreenAsia (Product ID 0x12) based game

	  controller or adapter.
@@ -313,9 +394,8 @@ config GREENASIA_FF 
	and want to enable force feedback support for it.



config HID_SMARTJOYPLUS

	tristate "SmartJoy PLUS PS2/USB adapter support" if EMBEDDED

	tristate "SmartJoy PLUS PS2/USB adapter support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for SmartJoy PLUS PS2/USB adapter.
@@ -328,16 +408,14 @@ config SMARTJOYPLUS_FF 
	enable force feedback support for it.



config HID_TOPSEED

	tristate "TopSeed Cyberlink remote control support" if EMBEDDED

	tristate "TopSeed Cyberlink remote control support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	Say Y if you have a TopSeed Cyberlink remote control.

	Say Y if you have a TopSeed Cyberlink or BTC Emprex remote control.



config HID_THRUSTMASTER

	tristate "ThrustMaster devices support" if EMBEDDED

	tristate "ThrustMaster devices support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or

	  a THRUSTMASTER Ferrari GT Rumble Wheel.
@@ -357,10 +435,17 @@ config HID_WACOM 
	---help---

	Support for Wacom Graphire Bluetooth tablet.



config HID_WACOM_POWER_SUPPLY

	bool "Wacom Bluetooth devices power supply status support"

	depends on HID_WACOM

	select POWER_SUPPLY

	---help---

	  Say Y here if you want to enable power supply status monitoring for

	  Wacom Bluetooth devices.



config HID_ZEROPLUS

	tristate "Zeroplus based game controller support" if EMBEDDED

	tristate "Zeroplus based game controller support"

	depends on USB_HID

	default !EMBEDDED

	---help---

	  Say Y here if you have a Zeroplus based game controller.
@@ -372,6 +457,12 @@ config ZEROPLUS_FF 
	  Say Y here if you have a Zeroplus based game controller and want

	  to have force feedback support for it.



config HID_ZYDACRON

	tristate "Zydacron remote control support"

	depends on USB_HID

	---help---

	Support for Zydacron remote control.



endmenu



endif # HID_SUPPORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE