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

HID: move belkin quirks 



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

drivers/hid/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ config HID_APPLE 


	If unsure, say M.



config HID_BELKIN

	tristate "Belkin"

	default m

	depends on USB_HID

	---help---

	Support for Belkin Flip KVM and Wireless keyboard.



config HID_CHERRY

	tristate "Cherry"

	default m

drivers/hid/Makefile

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


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

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

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

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

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

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

drivers/hid/hid-belkin.c

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

 *  HID driver for some belkin "special" devices

 *

 *  Copyright (c) 1999 Andreas Gal

 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby

 */



/*

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



#define BELKIN_HIDDEV	0x01

#define BELKIN_WKBD	0x02



#define belkin_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \

					EV_KEY, (c))

static int belkin_input_mapping(struct hid_device *hdev, struct hid_input *hi,

		struct hid_field *field, struct hid_usage *usage,

		unsigned long **bit, int *max)

{

	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);



	if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER ||

			!(quirks & BELKIN_WKBD))

		return 0;



	switch (usage->hid & HID_USAGE) {

	case 0x03a: belkin_map_key_clear(KEY_SOUND);		break;

	case 0x03b: belkin_map_key_clear(KEY_CAMERA);		break;

	case 0x03c: belkin_map_key_clear(KEY_DOCUMENTS);	break;

	default:

		return 0;

	}

	return 1;

}



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

{

	unsigned long quirks = id->driver_data;

	int ret;



	hid_set_drvdata(hdev, (void *)quirks);



	if (quirks & BELKIN_HIDDEV)

		hdev->quirks |= HID_QUIRK_HIDDEV;



	ret = hid_parse(hdev);

	if (ret) {

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

		goto err_free;

	}



	ret = hid_hw_start(hdev);

	if (ret) {

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

		goto err_free;

	}



	return 0;

err_free:

	return ret;

}



static const struct hid_device_id belkin_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM),

		.driver_data = BELKIN_HIDDEV },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD),

		.driver_data = BELKIN_WKBD },

	{ }

};

MODULE_DEVICE_TABLE(hid, belkin_devices);



static struct hid_driver belkin_driver = {

	.name = "belkin",

	.id_table = belkin_devices,

	.input_mapping = belkin_input_mapping,

	.probe = belkin_probe,

};



static int belkin_init(void)

{

	return hid_register_driver(&belkin_driver);

}



static void belkin_exit(void)

{

	hid_unregister_driver(&belkin_driver);

}



module_init(belkin_init);

module_exit(belkin_exit);

MODULE_LICENSE("GPL");



HID_COMPAT_LOAD_DRIVER(belkin);

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1164,12 +1164,14 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_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_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },

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_APPLE_MODULE

	HID_COMPAT_CALL_DRIVER(apple);

#endif

#ifdef CONFIG_HID_BELKIN_MODULE

	HID_COMPAT_CALL_DRIVER(belkin);

#endif

#ifdef CONFIG_HID_CHERRY_MODULE

	HID_COMPAT_CALL_DRIVER(cherry);

#endif