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

HID: move chicony quirks 



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

drivers/hid/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ config HID_CHERRY 
	---help---

	Support for Cherry Cymotion.



config HID_CHICONY

	tristate "Chicony"

	default m

	depends on USB_HID

	---help---

	Support for Chicony Tactical pad.



config HID_CYPRESS

	tristate "Cypress"

	default m

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ endif 
obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o

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

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

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

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

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

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

drivers/hid/hid-chicony.c

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

 *  HID driver for some chicony "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/input.h>

#include <linux/hid.h>

#include <linux/module.h>



#include "hid-ids.h"



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

					EV_KEY, (c))

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

		struct hid_field *field, struct hid_usage *usage,

		unsigned long **bit, int *max)

{

	if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)

		return 0;



	set_bit(EV_REP, hi->input->evbit);

	switch (usage->hid & HID_USAGE) {

	case 0xff01: ch_map_key_clear(BTN_1);	break;

	case 0xff02: ch_map_key_clear(BTN_2);	break;

	case 0xff03: ch_map_key_clear(BTN_3);	break;

	case 0xff04: ch_map_key_clear(BTN_4);	break;

	case 0xff05: ch_map_key_clear(BTN_5);	break;

	case 0xff06: ch_map_key_clear(BTN_6);	break;

	case 0xff07: ch_map_key_clear(BTN_7);	break;

	case 0xff08: ch_map_key_clear(BTN_8);	break;

	case 0xff09: ch_map_key_clear(BTN_9);	break;

	case 0xff0a: ch_map_key_clear(BTN_A);	break;

	case 0xff0b: ch_map_key_clear(BTN_B);	break;

	default:

		return 0;

	}

	return 1;

}



static const struct hid_device_id ch_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ch_devices);



static struct hid_driver ch_driver = {

	.name = "chicony",

	.id_table = ch_devices,

	.input_mapping = ch_input_mapping,

};



static int ch_init(void)

{

	return hid_register_driver(&ch_driver);

}



static void ch_exit(void)

{

	hid_unregister_driver(&ch_driver);

}



module_init(ch_init);

module_exit(ch_exit);

MODULE_LICENSE("GPL");



HID_COMPAT_LOAD_DRIVER(chicony);

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1165,6 +1165,7 @@ 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_GEYSER1_TP_ONLY) },

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

drivers/hid/hid-dummy.c

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

	HID_COMPAT_CALL_DRIVER(cherry);

#endif

#ifdef CONFIG_HID_CHICONY_MODULE

	HID_COMPAT_CALL_DRIVER(chicony);

#endif

#ifdef CONFIG_HID_CYPRESS_MODULE

	HID_COMPAT_CALL_DRIVER(cypress);

#endif