Commit 78a849a6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: move microsoft quirks 



Move them from the core code to a separate driver.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 880d29f1

drivers/hid/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,14 @@ config HID_LOGITECH 
	Support for some Logitech devices which breaks less or more

	HID specification.



config HID_MICROSOFT

	tristate "Microsoft"

	default m

	depends on USB_HID

	---help---

	Support for some Microsoft devices which breaks less or more

	HID specification.



endmenu



endif # HID_SUPPORT

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ endif 


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

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

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



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

drivers/hid/hid-core.c

+6 −0
Original line number Diff line number Diff line
@@ -1176,8 +1176,14 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },

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



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },

	{ }

};

drivers/hid/hid-dummy.c

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

	HID_COMPAT_CALL_DRIVER(logitech);

#endif

#ifdef CONFIG_HID_MICROSOFT_MODULE

	HID_COMPAT_CALL_DRIVER(microsoft);

#endif



	return -EIO;

}

drivers/hid/hid-ids.h

+3 −1
Original line number Diff line number Diff line
@@ -280,9 +280,11 @@ 
#define USB_VENDOR_ID_MICROSOFT		0x045e

#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b

#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d

#define USB_DEVICE_ID_DESKTOP_RECV_1028 0x00f9

#define USB_DEVICE_ID_MS_NE4K		0x00db

#define USB_DEVICE_ID_MS_LK6K		0x00f9

#define USB_DEVICE_ID_MS_PRESENTER_8K_BT	0x0701

#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713





#define USB_VENDOR_ID_MONTEREY		0x0566

#define USB_DEVICE_ID_GENIUS_KB29E	0x3004