Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ee29f6a 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:
  HID: add USB IDs for MacBook 3rd generation
  HID: add LCSPEC from VERNIER to quirk list
  HID: fix processing of event quirks
  HID: Blacklist new GTCO CalComp USB device PIDs
parents 4e3d0319 5906a044

drivers/hid/hid-input-quirks.c

+9 −8
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ int hidinput_mapping_quirks(struct hid_usage *usage, 
	return 0;

}



void hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)

int hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)

{

	struct input_dev *input;
@@ -362,34 +362,34 @@ void hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, stru 
		|| ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007))) {

		if (value) hid->quirks |=  HID_QUIRK_2WHEEL_MOUSE_HACK_ON;

		else       hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;

		return;

		return 1;

	}



	if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &&

			(usage->type == EV_REL) &&

			(usage->code == REL_WHEEL)) {

		hid->delayed_value = value;

		return;

		return 1;

	}



	if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &&

			(usage->hid == 0x000100b8)) {

		input_event(input, EV_REL, value ? REL_HWHEEL : REL_WHEEL, hid->delayed_value);

		return;

		return 1;

	}



	if ((hid->quirks & HID_QUIRK_INVERT_HWHEEL) && (usage->code == REL_HWHEEL)) {

		input_event(input, usage->type, usage->code, -value);

		return;

		return 1;

	}



	if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON) && (usage->code == REL_WHEEL)) {

		input_event(input, usage->type, REL_HWHEEL, value);

		return;

		return 1;

	}



	if ((hid->quirks & HID_QUIRK_APPLE_HAS_FN) && hidinput_apple_event(hid, input, usage, value))

		return;

		return 1;



	/* Handling MS keyboards special buttons */

	if (hid->quirks & HID_QUIRK_MICROSOFT_KEYS &&
@@ -416,8 +416,9 @@ void hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, stru 
	if (hid->quirks & HID_QUIRK_HWHEEL_WHEEL_INVERT &&

			usage->type == EV_REL && usage->code == REL_HWHEEL) {

		input_event(input, usage->type, REL_WHEEL, -value);

		return;

		return 1;

	}

	return 0;

}

drivers/hid/hid-input.c

+7 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ struct hidinput_key_translation { 
#define APPLE_FLAG_FKEY 0x01



static struct hidinput_key_translation apple_fn_keys[] = {

	{ KEY_BACKSPACE, KEY_DELETE },

	{ KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },

	{ KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },

	{ KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */
@@ -109,6 +110,10 @@ static struct hidinput_key_translation apple_fn_keys[] = { 
	{ KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },

	{ KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },

	{ KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },

	{ KEY_UP,       KEY_PAGEUP },

	{ KEY_DOWN,     KEY_PAGEDOWN },

	{ KEY_LEFT,     KEY_HOME },

	{ KEY_RIGHT,    KEY_END },

	{ }

};
@@ -854,7 +859,8 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct 
		return;



	/* handle input events for quirky devices */

	hidinput_event_quirks(hid, field, usage, value);

	if (hidinput_event_quirks(hid, field, usage, value))

		return;



	if (usage->hat_min < usage->hat_max || usage->hat_dir) {

		int hat_dir = usage->hat_dir;

drivers/hid/usbhid/hid-quirks.c

+37 −1
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ 
#define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220

#define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221

#define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222

#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229

#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a

#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e

#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b

#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
@@ -193,6 +199,17 @@ 
#define USB_DEVICE_ID_GTCO_502		0x0502

#define USB_DEVICE_ID_GTCO_503		0x0503

#define USB_DEVICE_ID_GTCO_504		0x0504

#define USB_DEVICE_ID_GTCO_600		0x0600

#define USB_DEVICE_ID_GTCO_601		0x0601

#define USB_DEVICE_ID_GTCO_602		0x0602

#define USB_DEVICE_ID_GTCO_603		0x0603

#define USB_DEVICE_ID_GTCO_604		0x0604

#define USB_DEVICE_ID_GTCO_605		0x0605

#define USB_DEVICE_ID_GTCO_606		0x0606

#define USB_DEVICE_ID_GTCO_607		0x0607

#define USB_DEVICE_ID_GTCO_608		0x0608

#define USB_DEVICE_ID_GTCO_609		0x0609

#define USB_DEVICE_ID_GTCO_609		0x0609

#define USB_DEVICE_ID_GTCO_1000		0x1000

#define USB_DEVICE_ID_GTCO_1001		0x1001

#define USB_DEVICE_ID_GTCO_1002		0x1002
@@ -200,7 +217,7 @@ 
#define USB_DEVICE_ID_GTCO_1004		0x1004

#define USB_DEVICE_ID_GTCO_1005		0x1005

#define USB_DEVICE_ID_GTCO_1006		0x1006



#define USB_DEVICE_ID_GTCO_1007		0x1007

#define USB_VENDOR_ID_HAPP		0x078b

#define USB_DEVICE_ID_UGCI_DRIVING	0x0010

#define USB_DEVICE_ID_UGCI_FLYING	0x0020
@@ -368,6 +385,7 @@ 
#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002

#define USB_DEVICE_ID_VERNIER_SKIP	0x0003

#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004

#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006



#define USB_VENDOR_ID_WACOM		0x056a
@@ -496,6 +514,16 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_600, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_601, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_602, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_603, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_604, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_605, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_606, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_607, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_608, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_609, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002, HID_QUIRK_IGNORE },
@@ -503,6 +531,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },
@@ -541,6 +570,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT, HID_QUIRK_IGNORE },
@@ -593,6 +623,12 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

include/linux/hid.h

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ int hid_set_field(struct hid_field *, unsigned, __s32); 
int hid_input_report(struct hid_device *, int type, u8 *, int, int);

int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);

int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long **, int *);

void hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);

int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);

int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32);

void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);

void hid_output_report(struct hid_report *report, __u8 *data);