Commit 1e093206 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: add support for another Gyration remote control 



There is a slightly different Gyration remote control, which
requires the quirks we already have in place for the 0x0002 PID,
plus KEY_MEDIA mapping is different.

Reported-by: default avatarMarc Randolph <mrand@pobox.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 022b7024

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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_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_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) },

drivers/hid/hid-gyration.c

+3 −1
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
 *  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

 *  Copyright (c) 2006-2008 Jiri Kosina

 */



/*
@@ -40,6 +40,7 @@ static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	case 0x025: gy_map_key_clear(KEY_PVR);		break;

	case 0x046: gy_map_key_clear(KEY_MEDIA);	break;

	case 0x047: gy_map_key_clear(KEY_MP3);		break;

	case 0x048: gy_map_key_clear(KEY_MEDIA);	break;

	case 0x049: gy_map_key_clear(KEY_CAMERA);	break;

	case 0x04a: gy_map_key_clear(KEY_VIDEO);	break;
@@ -68,6 +69,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field, 


static const struct hid_device_id gyration_devices[] = {

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

	{ }

};

MODULE_DEVICE_TABLE(hid, gyration_devices);

drivers/hid/hid-ids.h

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


#define USB_VENDOR_ID_GYRATION		0x0c16

#define USB_DEVICE_ID_GYRATION_REMOTE	0x0002

#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003



#define USB_VENDOR_ID_HAPP		0x078b

#define USB_DEVICE_ID_UGCI_DRIVING	0x0010

CRA Git | Maintained and supported by SUSTech CRA and CCSE