Commit 5cf65713 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: (30 commits)
  Revert "HID: add support for the Wacom Intuos 4 wireless"
  HID: fix up Kconfig entry for ACRUX driver
  HID: add ACRUX game controller force feedback support
  HID: Force input registration for "VEC footpedal"
  HID: add HID_QUIRK_HIDINPUT_FORCE
  HID: hid-input.c: indentation fixes
  HID: hiddev: use usb_find_interface, get rid of BKL
  HID: ignore digitizer usage Undefined (0x00)
  HID: Add support for Conceptronic CLLRCMCE
  HID: hid-ids.h: Whitespace fixup, align using TABs
  HID: picolcd: implement refcounting of framebuffer
  HID: picolcd: do not reallocate memory on depth change
  HID: picolcd: Add minimal palette required by fbcon on 8bpp
  HID: magicmouse: Correct parsing of large X and Y motions.
  HID: magicmouse: report last touch up
  HID: picolcd: fix deferred_io init/cleanup to fb ordering
  HID: hid-ids.h: keep vendor ids in alphabetical order
  HID: add proper support for Elecom BM084 bluetooth mouse
  HID: magicmouse: enable horizontal scrolling
  HID: magicmouse: add param for scroll speed
  ...
parents b7c8e55d 9f17d516

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

+0 −13
Original line number Diff line number Diff line
@@ -33,19 +33,6 @@ Description: When read, this file returns the raw integer version number of 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>

drivers/hid/Kconfig

+17 −2
Original line number Diff line number Diff line
@@ -68,6 +68,14 @@ config HID_A4TECH 
	---help---

	Support for A4 tech X5 and WOP-35 / Trust 450L mice.



config HID_ACRUX_FF

	tristate "ACRUX force feedback support"

	depends on USB_HID

	select INPUT_FF_MEMLESS

	---help---

	Say Y here if you want to enable force feedback support for ACRUX

	game controllers.



config HID_APPLE

	tristate "Apple" if EMBEDDED

	depends on (USB_HID || BT_HIDP)
@@ -148,6 +156,12 @@ config HID_EGALAX 
	---help---

	Support for the eGalax dual-touch panel.



config HID_ELECOM

	tristate "ELECOM"

	depends on BT_HIDP

	---help---

	Support for the ELECOM BM084 (bluetooth mouse).



config HID_EZKEY

	tristate "Ezkey" if EMBEDDED

	depends on USB_HID
@@ -417,10 +431,11 @@ config SMARTJOYPLUS_FF 
	enable force feedback support for it.



config HID_TOPSEED

	tristate "TopSeed Cyberlink remote control support"

	tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"

	depends on USB_HID

	---help---

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

	Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic

	CLLRCMCE remote control.



config HID_THRUSTMASTER

	tristate "ThrustMaster devices support"

drivers/hid/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ endif 


obj-$(CONFIG_HID_3M_PCT)	+= hid-3m-pct.o

obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o

obj-$(CONFIG_HID_ACRUX_FF)	+= hid-axff.o

obj-$(CONFIG_HID_APPLE)		+= hid-apple.o

obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o

obj-$(CONFIG_HID_CANDO)		+= hid-cando.o
@@ -32,6 +33,7 @@ obj-$(CONFIG_HID_CHICONY) += hid-chicony.o 
obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

obj-$(CONFIG_HID_DRAGONRISE)	+= hid-drff.o

obj-$(CONFIG_HID_EGALAX)	+= hid-egalax.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_KENSINGTON)	+= hid-kensington.o

drivers/hid/hid-axff.c

0 → 100644
+172 −0
Original line number Diff line number Diff line 
/*

 * Force feedback support for ACRUX game controllers

 *

 * From what I have gathered, these devices are mass produced in China

 * by several vendors. They often share the same design as the original

 * Xbox 360 controller.

 *

 * 1a34:0802 "ACRUX USB GAMEPAD 8116"

 *  - tested with a EXEQ EQ-PCU-02090 game controller.

 *

 * Copyright (c) 2010 Sergei Kolzun <x0r@dv-life.ru>

 */



/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



#include <linux/input.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/hid.h>



#include "hid-ids.h"

#include "usbhid/usbhid.h"



struct axff_device {

	struct hid_report *report;

};



static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect)

{

	struct hid_device *hid = input_get_drvdata(dev);

	struct axff_device *axff = data;

	int left, right;



	left = effect->u.rumble.strong_magnitude;

	right = effect->u.rumble.weak_magnitude;



	dbg_hid("called with 0x%04x 0x%04x", left, right);



	left = left * 0xff / 0xffff;

	right = right * 0xff / 0xffff;



	axff->report->field[0]->value[0] = left;

	axff->report->field[1]->value[0] = right;

	axff->report->field[2]->value[0] = left;

	axff->report->field[3]->value[0] = right;

	dbg_hid("running with 0x%02x 0x%02x", left, right);

	usbhid_submit_report(hid, axff->report, USB_DIR_OUT);



	return 0;

}



static int axff_init(struct hid_device *hid)

{

	struct axff_device *axff;

	struct hid_report *report;

	struct hid_input *hidinput = list_first_entry(&hid->inputs, struct hid_input, list);

	struct list_head *report_list =&hid->report_enum[HID_OUTPUT_REPORT].report_list;

	struct input_dev *dev = hidinput->input;

	int error;



	if (list_empty(report_list)) {

		dev_err(&hid->dev, "no output reports found\n");

		return -ENODEV;

	}



	report = list_first_entry(report_list, struct hid_report, list);



	if (report->maxfield < 4) {

		dev_err(&hid->dev, "no fields in the report: %d\n", report->maxfield);

		return -ENODEV;

	}



	axff = kzalloc(sizeof(struct axff_device), GFP_KERNEL);

	if (!axff)

		return -ENOMEM;



	set_bit(FF_RUMBLE, dev->ffbit);



	error = input_ff_create_memless(dev, axff, axff_play);

	if (error)

		goto err_free_mem;



	axff->report = report;

	axff->report->field[0]->value[0] = 0x00;

	axff->report->field[1]->value[0] = 0x00;

	axff->report->field[2]->value[0] = 0x00;

	axff->report->field[3]->value[0] = 0x00;

	usbhid_submit_report(hid, axff->report, USB_DIR_OUT);



	dev_info(&hid->dev, "Force Feedback for ACRUX game controllers by Sergei Kolzun<x0r@dv-life.ru>\n");



	return 0;



err_free_mem:

	kfree(axff);

	return error;

}



static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)

{

	int error;



	dev_dbg(&hdev->dev, "ACRUX HID hardware probe...");



	error = hid_parse(hdev);

	if (error) {

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

		return error;

	}



	error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);

	if (error) {

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

		return error;

	}



	error = axff_init(hdev);

	if (error) {

		/*

		 * Do not fail device initialization completely as device

		 * may still be partially operable, just warn.

		 */

		dev_warn(&hdev->dev,

			 "Failed to enable force feedback support, error: %d\n",

			 error);

	}



	return 0;

}



static const struct hid_device_id ax_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), },

	{ }

};

MODULE_DEVICE_TABLE(hid, ax_devices);



static struct hid_driver ax_driver = {

	.name = "acrux",

	.id_table = ax_devices,

	.probe = ax_probe,

};



static int __init ax_init(void)

{

	return hid_register_driver(&ax_driver);

}



static void __exit ax_exit(void)

{

	hid_unregister_driver(&ax_driver);

}



module_init(ax_init);

module_exit(ax_exit);



MODULE_AUTHOR("Sergei Kolzun");

MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers");

MODULE_LICENSE("GPL");

drivers/hid/hid-core.c

+7 −1
Original line number Diff line number Diff line
@@ -1157,6 +1157,8 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 


	if (hdev->quirks & HID_QUIRK_HIDDEV_FORCE)

		connect_mask |= (HID_CONNECT_HIDDEV_FORCE | HID_CONNECT_HIDDEV);

	if (hdev->quirks & HID_QUIRK_HIDINPUT_FORCE)

		connect_mask |= HID_CONNECT_HIDINPUT_FORCE;

	if (hdev->bus != BUS_USB)

		connect_mask &= ~HID_CONNECT_HIDDEV;

	if (hid_hiddev(hdev))
@@ -1239,6 +1241,9 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },

#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)

	{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
@@ -1294,6 +1299,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
@@ -1375,10 +1381,10 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE