Commit 8606ab6d 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: (22 commits)
  HID: fix error condition propagation in hid-sony driver
  HID: fix reference count leak hidraw
  HID: add proper support for pensketch 12x9 tablet
  HID: don't allow DealExtreme usb-radio be handled by usb hid driver
  HID: fix default Kconfig setting for TopSpeed driver
  HID: driver for TopSeed Cyberlink quirky remote
  HID: make boot protocol drivers depend on EMBEDDED
  HID: avoid sparse warning in HID_COMPAT_LOAD_DRIVER
  HID: hiddev cleanup -- handle all error conditions properly
  HID: force feedback driver for GreenAsia 0x12 PID
  HID: switch specialized drivers from "default y" to !EMBEDDED
  HID: set proper dev.parent in hidraw
  HID: add dynids facility
  HID: use GFP_KERNEL in hid_alloc_buffers
  HID: usbhid, use usb_endpoint_xfer_int
  HID: move usbhid flags to usbhid.h
  HID: add n-trig digitizer support
  HID: add phys and name ioctls to hidraw
  HID: struct device - replace bus_id with dev_name(), dev_set_name()
  HID: automatically call usbhid_set_leds in usbhid driver
  ...
parents c54febae ed42350e

drivers/hid/Kconfig

+39 −31
Original line number Original line Diff line number Diff line
@@ -85,14 +85,14 @@ config HID_COMPAT 
config HID_A4TECH

config HID_A4TECH

	tristate "A4 tech" if EMBEDDED

	tristate "A4 tech" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

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

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





config HID_APPLE

config HID_APPLE

	tristate "Apple" if EMBEDDED

	tristate "Apple" if EMBEDDED

	depends on (USB_HID || BT_HIDP)

	depends on (USB_HID || BT_HIDP)

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for some Apple devices which less or more break

	Support for some Apple devices which less or more break

	HID specification.

	HID specification.
@@ -103,64 +103,49 @@ config HID_APPLE 
config HID_BELKIN

config HID_BELKIN

	tristate "Belkin" if EMBEDDED

	tristate "Belkin" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Belkin Flip KVM and Wireless keyboard.

	Support for Belkin Flip KVM and Wireless keyboard.





config HID_BRIGHT

	tristate "Bright" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Bright ABNT-2 keyboard.



config HID_CHERRY

config HID_CHERRY

	tristate "Cherry" if EMBEDDED

	tristate "Cherry" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Cherry Cymotion keyboard.

	Support for Cherry Cymotion keyboard.





config HID_CHICONY

config HID_CHICONY

	tristate "Chicony" if EMBEDDED

	tristate "Chicony" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Chicony Tactical pad.

	Support for Chicony Tactical pad.





config HID_CYPRESS

config HID_CYPRESS

	tristate "Cypress" if EMBEDDED

	tristate "Cypress" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for cypress mouse and barcode readers.

	Support for cypress mouse and barcode readers.





config HID_DELL

	tristate "Dell" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for quirky Dell HID hardware that require

	special LED handling (W7658 and SK8115 models)



config HID_EZKEY

config HID_EZKEY

	tristate "Ezkey" if EMBEDDED

	tristate "Ezkey" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Ezkey BTC 8193 keyboard.

	Support for Ezkey BTC 8193 keyboard.





config HID_GYRATION

config HID_GYRATION

	tristate "Gyration" if EMBEDDED

	tristate "Gyration" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Gyration remote control.

	Support for Gyration remote control.





config HID_LOGITECH

config HID_LOGITECH

	tristate "Logitech" if EMBEDDED

	tristate "Logitech" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Logitech devices that are not fully compliant with HID standard.

	Support for Logitech devices that are not fully compliant with HID standard.
@@ -191,21 +176,28 @@ config LOGIRUMBLEPAD2_FF 
config HID_MICROSOFT

config HID_MICROSOFT

	tristate "Microsoft" if EMBEDDED

	tristate "Microsoft" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Microsoft devices that are not fully compliant with HID standard.

	Support for Microsoft devices that are not fully compliant with HID standard.





config HID_MONTEREY

config HID_MONTEREY

	tristate "Monterey" if EMBEDDED

	tristate "Monterey" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Monterey Genius KB29E.

	Support for Monterey Genius KB29E.





config HID_NTRIG

	tristate "NTrig" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for N-Trig touch screen.



config HID_PANTHERLORD

config HID_PANTHERLORD

	tristate "Pantherlord devices support" if EMBEDDED

	tristate "Pantherlord devices support" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for PantherLord/GreenAsia based device support.

	Support for PantherLord/GreenAsia based device support.
@@ -220,31 +212,47 @@ config PANTHERLORD_FF 
config HID_PETALYNX

config HID_PETALYNX

	tristate "Petalynx" if EMBEDDED

	tristate "Petalynx" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Petalynx Maxter remote control.

	Support for Petalynx Maxter remote control.





config HID_SAMSUNG

config HID_SAMSUNG

	tristate "Samsung" if EMBEDDED

	tristate "Samsung" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Samsung InfraRed remote control.

	Support for Samsung InfraRed remote control.





config HID_SONY

config HID_SONY

	tristate "Sony" if EMBEDDED

	tristate "Sony" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Sony PS3 controller.

	Support for Sony PS3 controller.





config HID_SUNPLUS

config HID_SUNPLUS

	tristate "Sunplus" if EMBEDDED

	tristate "Sunplus" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

	default y

	default !EMBEDDED

	---help---

	---help---

	Support for Sunplus wireless desktop.

	Support for Sunplus wireless desktop.





config GREENASIA_FF

	tristate "GreenAsia (Product ID 0x12) force feedback support"

	depends on USB_HID

	select INPUT_FF_MEMLESS

	---help---

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

	(like MANTA Warior MM816 and SpeedLink Strike2 SL-6635) or adapter

	and want to enable force feedback support for it.



config HID_TOPSEED

	tristate "TopSeed Cyberlink remote control support" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Say Y if you have a TopSeed Cyberlink remote control.



config THRUSTMASTER_FF

config THRUSTMASTER_FF

	tristate "ThrustMaster devices support"

	tristate "ThrustMaster devices support"

	depends on USB_HID

	depends on USB_HID

drivers/hid/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -23,22 +23,23 @@ endif 
obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o

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

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

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

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

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

obj-$(CONFIG_HID_BRIGHT)	+= hid-bright.o

obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o

obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o

obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

obj-$(CONFIG_HID_DELL)		+= hid-dell.o

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

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

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

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

obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o

obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

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

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

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

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

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

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

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

obj-$(CONFIG_THRUSTMASTER_FF)	+= hid-tmff.o

obj-$(CONFIG_THRUSTMASTER_FF)	+= hid-tmff.o

obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o

obj-$(CONFIG_ZEROPLUS_FF)	+= hid-zpff.o

obj-$(CONFIG_ZEROPLUS_FF)	+= hid-zpff.o





obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_HID)		+= usbhid/

drivers/hid/hid-bright.c

deleted100644 → 0
+0 −71
Original line number Original line Diff line number Diff line 
/*

 *  HID driver for some bright "special" devices

 *

 *  Copyright (c) 2008 Mauro Carvalho Chehab <mchehab@redhat.com>

 *

 * Based on hid-dell driver

 */



/*

 * 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.

 */



#include <linux/device.h>

#include <linux/hid.h>

#include <linux/module.h>



#include "hid-ids.h"



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

{

	int ret;



	ret = hid_parse(hdev);

	if (ret) {

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

		goto err_free;

	}



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

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

		goto err_free;

	}



	usbhid_set_leds(hdev);



	return 0;

err_free:

	return ret;

}



static const struct hid_device_id bright_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },

	{ }

};

MODULE_DEVICE_TABLE(hid, bright_devices);



static struct hid_driver bright_driver = {

	.name = "bright",

	.id_table = bright_devices,

	.probe = bright_probe,

};



static int bright_init(void)

{

	return hid_register_driver(&bright_driver);

}



static void bright_exit(void)

{

	hid_unregister_driver(&bright_driver);

}



module_init(bright_init);

module_exit(bright_exit);

MODULE_LICENSE("GPL");



HID_COMPAT_LOAD_DRIVER(bright);

drivers/hid/hid-core.c

+109 −11
Original line number Original line Diff line number Diff line
@@ -1256,19 +1256,16 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },

	{ 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_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
@@ -1279,7 +1276,6 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },
@@ -1297,23 +1293,105 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },





	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },

	{ }

	{ }

};

};





struct hid_dynid {

	struct list_head list;

	struct hid_device_id id;

};



/**

 * store_new_id - add a new HID device ID to this driver and re-probe devices

 * @driver: target device driver

 * @buf: buffer for scanning device ID data

 * @count: input size

 *

 * Adds a new dynamic hid device ID to this driver,

 * and causes the driver to probe for all devices again.

 */

static ssize_t store_new_id(struct device_driver *drv, const char *buf,

		size_t count)

{

	struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);

	struct hid_dynid *dynid;

	__u32 bus, vendor, product;

	unsigned long driver_data = 0;

	int ret;



	ret = sscanf(buf, "%x %x %x %lx",

			&bus, &vendor, &product, &driver_data);

	if (ret < 3)

		return -EINVAL;



	dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);

	if (!dynid)

		return -ENOMEM;



	dynid->id.bus = bus;

	dynid->id.vendor = vendor;

	dynid->id.product = product;

	dynid->id.driver_data = driver_data;



	spin_lock(&hdrv->dyn_lock);

	list_add_tail(&dynid->list, &hdrv->dyn_list);

	spin_unlock(&hdrv->dyn_lock);



	ret = 0;

	if (get_driver(&hdrv->driver)) {

		ret = driver_attach(&hdrv->driver);

		put_driver(&hdrv->driver);

	}



	return ret ? : count;

}

static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id);



static void hid_free_dynids(struct hid_driver *hdrv)

{

	struct hid_dynid *dynid, *n;



	spin_lock(&hdrv->dyn_lock);

	list_for_each_entry_safe(dynid, n, &hdrv->dyn_list, list) {

		list_del(&dynid->list);

		kfree(dynid);

	}

	spin_unlock(&hdrv->dyn_lock);

}



static const struct hid_device_id *hid_match_device(struct hid_device *hdev,

		struct hid_driver *hdrv)

{

	struct hid_dynid *dynid;



	spin_lock(&hdrv->dyn_lock);

	list_for_each_entry(dynid, &hdrv->dyn_list, list) {

		if (hid_match_one_id(hdev, &dynid->id)) {

			spin_unlock(&hdrv->dyn_lock);

			return &dynid->id;

		}

	}

	spin_unlock(&hdrv->dyn_lock);



	return hid_match_id(hdev, hdrv->id_table);

}



static int hid_bus_match(struct device *dev, struct device_driver *drv)

static int hid_bus_match(struct device *dev, struct device_driver *drv)

{

{

	struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);

	struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);





	if (!hid_match_id(hdev, hdrv->id_table))

	if (!hid_match_device(hdev, hdrv))

		return 0;

		return 0;





	/* generic wants all non-blacklisted */

	/* generic wants all non-blacklisted */
@@ -1332,7 +1410,7 @@ static int hid_device_probe(struct device *dev) 
	int ret = 0;

	int ret = 0;





	if (!hdev->driver) {

	if (!hdev->driver) {

		id = hid_match_id(hdev, hdrv->id_table);

		id = hid_match_device(hdev, hdrv);

		if (id == NULL)

		if (id == NULL)

			return -ENODEV;

			return -ENODEV;
@@ -1420,6 +1498,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
@@ -1577,6 +1656,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ }

	{ }
@@ -1618,8 +1700,9 @@ int hid_add_device(struct hid_device *hdev) 
	if (hid_ignore(hdev))

	if (hid_ignore(hdev))

		return -ENODEV;

		return -ENODEV;





	/* XXX hack, any other cleaner solution < 20 bus_id bytes? */

	/* XXX hack, any other cleaner solution after the driver core

	sprintf(hdev->dev.bus_id, "%04X:%04X:%04X.%04X", hdev->bus,

	 * is converted to allow more than 20 bytes as the device name? */

	dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,

		     hdev->vendor, hdev->product, atomic_inc_return(&id));

		     hdev->vendor, hdev->product, atomic_inc_return(&id));





	ret = device_add(&hdev->dev);

	ret = device_add(&hdev->dev);
@@ -1695,18 +1778,33 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); 
int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,

int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,

		const char *mod_name)

		const char *mod_name)

{

{

	int ret;



	hdrv->driver.name = hdrv->name;

	hdrv->driver.name = hdrv->name;

	hdrv->driver.bus = &hid_bus_type;

	hdrv->driver.bus = &hid_bus_type;

	hdrv->driver.owner = owner;

	hdrv->driver.owner = owner;

	hdrv->driver.mod_name = mod_name;

	hdrv->driver.mod_name = mod_name;





	return driver_register(&hdrv->driver);

	INIT_LIST_HEAD(&hdrv->dyn_list);

	spin_lock_init(&hdrv->dyn_lock);



	ret = driver_register(&hdrv->driver);

	if (ret)

		return ret;



	ret = driver_create_file(&hdrv->driver, &driver_attr_new_id);

	if (ret)

		driver_unregister(&hdrv->driver);



	return ret;

}

}

EXPORT_SYMBOL_GPL(__hid_register_driver);

EXPORT_SYMBOL_GPL(__hid_register_driver);





void hid_unregister_driver(struct hid_driver *hdrv)

void hid_unregister_driver(struct hid_driver *hdrv)

{

{

	driver_remove_file(&hdrv->driver, &driver_attr_new_id);

	driver_unregister(&hdrv->driver);

	driver_unregister(&hdrv->driver);

	hid_free_dynids(hdrv);

}

}

EXPORT_SYMBOL_GPL(hid_unregister_driver);

EXPORT_SYMBOL_GPL(hid_unregister_driver);

drivers/hid/hid-dummy.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,9 @@ static int __init hid_dummy_init(void) 
#ifdef CONFIG_HID_MONTEREY_MODULE

#ifdef CONFIG_HID_MONTEREY_MODULE

	HID_COMPAT_CALL_DRIVER(monterey);

	HID_COMPAT_CALL_DRIVER(monterey);

#endif

#endif

#ifdef CONFIG_HID_NTRIG_MODULE

	HID_COMPAT_CALL_DRIVER(ntrig);

#endif

#ifdef CONFIG_HID_PANTHERLORD_MODULE

#ifdef CONFIG_HID_PANTHERLORD_MODULE

	HID_COMPAT_CALL_DRIVER(pantherlord);

	HID_COMPAT_CALL_DRIVER(pantherlord);

#endif

#endif
@@ -58,6 +61,9 @@ static int __init hid_dummy_init(void) 
#ifdef CONFIG_HID_SUNPLUS_MODULE

#ifdef CONFIG_HID_SUNPLUS_MODULE

	HID_COMPAT_CALL_DRIVER(sunplus);

	HID_COMPAT_CALL_DRIVER(sunplus);

#endif

#endif

#ifdef CONFIG_GREENASIA_FF_MODULE

	HID_COMPAT_CALL_DRIVER(greenasia);

#endif

#ifdef CONFIG_THRUSTMASTER_FF_MODULE

#ifdef CONFIG_THRUSTMASTER_FF_MODULE

	HID_COMPAT_CALL_DRIVER(thrustmaster);

	HID_COMPAT_CALL_DRIVER(thrustmaster);

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE