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

Commit 047dff63 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus 

Conflicts:
	drivers/hid/Kconfig
parents 72c16d9a b42065f3 89759e20

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

+11 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ Date: June 2011 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the backlight intensity for

		a specific profile. Profile number is included in written data.

		The data has to be 10 bytes long.

		The data has to be 10 bytes long for Isku, IskuFX needs	16 bytes

		of data.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net
@@ -141,3 +142,12 @@ Description: When written, this file lets one trigger easyshift functionality 
		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>/isku/roccatisku<minor>/talkfx

Date:		February 2013

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

Description:	When written, this file lets one trigger temporary color schemes

		from the host.

		The data has to be 16 bytes long.

		This file is writeonly.

Users:		http://roccat.sourceforge.net

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

0 → 100644
+105 −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>/konepure/roccatkonepure<minor>/actual_profile

Date:		December 2012

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. actual_profile holds number of actual profile.

		This value is persistent, so its value determines the profile

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

		When written, the mouse activates the set profile immediately.

		The data has to be 3 bytes long.

		The mouse will reject invalid data.

Users:		http://roccat.sourceforge.net



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

Date:		December 2012

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

Description:	When written, this file lets one select which data from which

		profile will be	read next. The data has to be 3 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>/konepure/roccatkonepure<minor>/info

Date:		December 2012

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

Description:	When read, this file returns general data like firmware version.

		When written, the device can be reset.

		The data is 6 bytes long.

Users:		http://roccat.sourceforge.net



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

Date:		December 2012

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

Description:	The mouse can store a macro with max 500 key/button strokes

		internally.

		When written, this file lets one set the sequence for a specific

		button for a specific profile. Button and profile numbers are

		included in written data. The data has to be 2082 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>/konepure/roccatkonepure<minor>/profile_buttons

Date:		December 2012

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 is split in settings and buttons.

		profile_buttons holds information about button layout.

		When written, this file lets one write the respective profile

		buttons back to the mouse. The data has to be 59 bytes long.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



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

Date:		December 2012

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 is split in settings and buttons.

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 31 bytes long.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



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

Date:		December 2012

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

Description:	The mouse has a tracking- and a distance-control-unit. These

		can be activated/deactivated and the lift-off distance can be

		set. The data has to be 6 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>/konepure/roccatkonepure<minor>/talk

Date:		December 2012

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>/konepure/roccatkonepure<minor>/tcu

Date:		December 2012

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

Description:	When written a calibration process for the tracking control unit

		can be initiated/cancelled. Also lets one read/write sensor

		registers.

		The data has to be 4 bytes long.

Users:		http://roccat.sourceforge.net



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

Date:		December 2012

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

Description:	When read the mouse returns a 30x30 pixel image of the

		sampled underground. This works only in the course of a

		calibration process initiated with tcu.

		The returned data is 1028 bytes in size.

		This file is readonly.

Users:		http://roccat.sourceforge.net

drivers/hid/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -384,13 +384,13 @@ config LOGIWHEELS_FF 
	  - Logitech Formula Force EX



config HID_MAGICMOUSE

	tristate "Apple MagicMouse multi-touch support"

	tristate "Apple Magic Mouse/Trackpad multi-touch support"

	depends on HID

	---help---

	Support for the Apple Magic Mouse multi-touch.

	Support for the Apple Magic Mouse/Trackpad multi-touch.



	Say Y here if you want support for the multi-touch features of the

	Apple Wireless "Magic" Mouse.

	Apple Wireless "Magic" Mouse and the Apple Wireless "Magic" Trackpad.



config HID_MICROSOFT

	tristate "Microsoft non-fully HID-compliant devices" if EXPERT
@@ -749,7 +749,7 @@ config HID_SENSOR_HUB 
	depends on HID && GENERIC_HARDIRQS

	select MFD_CORE

	default n

	-- help---

	---help---

	  Support for HID Sensor framework. This creates a MFD instance

	  for a sensor hub and identifies all the sensors connected to it.

	  Each sensor is registered as a MFD cell, so that sensor specific

drivers/hid/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ obj-$(CONFIG_HID_PRIMAX) += hid-primax.o 
obj-$(CONFIG_HID_PS3REMOTE)	+= hid-ps3remote.o

obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o hid-roccat-common.o \

	hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \

	hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-lua.o \

	hid-roccat-pyra.o hid-roccat-savu.o

	hid-roccat-koneplus.o hid-roccat-konepure.o hid-roccat-kovaplus.o \

	hid-roccat-lua.o hid-roccat-pyra.o hid-roccat-savu.o

obj-$(CONFIG_HID_SAITEK)	+= hid-saitek.o

obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o

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

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1635,6 +1635,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
@@ -1668,6 +1669,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_LUA) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },