Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36dbe2fc authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

Conflicts:
	drivers/hid/Makefile
Loading
Loading
Loading
Loading
+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.
+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
+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.
+79 −0
Original line number Diff line number Diff line
@@ -106,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
@@ -274,12 +289,76 @@ config HID_PETALYNX
	---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
	depends on USB_HID
+3 −0
Original line number Diff line number Diff line
@@ -43,9 +43,12 @@ obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o
obj-$(CONFIG_HID_MOSART)	+= hid-mosart.o
obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o
obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o
obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prodikeys.o
obj-$(CONFIG_HID_QUANTA)	+= hid-quanta.o
obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o
obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o
obj-$(CONFIG_HID_PICOLCD)	+= hid-picolcd.o
obj-$(CONFIG_HID_ROCCAT_KONE)	+= hid-roccat-kone.o
obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o
obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o
obj-$(CONFIG_HID_SONY)		+= hid-sony.o
Loading