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

Commit 9b028649 authored by Forest Wilkinson's avatar Forest Wilkinson Committed by Jiri Kosina
Browse files

HID: tivo: enable all buttons on the TiVo Slide Pro remote 



The linux kernel has supported the TiVo Slide remote control for some time, but
does not recognize the USB ID of the newer Slide Pro. This patch adds the
missing data structures so the newer remote will be recognized by the driver,
thereby allowing the TiVo, LiveTV, and Thumbs Up/Down buttons to be
mapped with a hwdb file.

Signed-off-by: default avatarForest Wilkinson <web11.forest@tibit.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a4154577

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1959,6 +1959,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

drivers/hid/hid-ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -899,6 +899,7 @@ 
#define USB_VENDOR_ID_TIVO		0x150a

#define USB_VENDOR_ID_TIVO		0x150a

#define USB_DEVICE_ID_TIVO_SLIDE_BT	0x1200

#define USB_DEVICE_ID_TIVO_SLIDE_BT	0x1200

#define USB_DEVICE_ID_TIVO_SLIDE	0x1201

#define USB_DEVICE_ID_TIVO_SLIDE	0x1201

#define USB_DEVICE_ID_TIVO_SLIDE_PRO	0x1203





#define USB_VENDOR_ID_TOPSEED		0x0766

#define USB_VENDOR_ID_TOPSEED		0x0766

#define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204

#define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204

drivers/hid/hid-tivo.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ static const struct hid_device_id tivo_devices[] = { 
	/* TiVo Slide Bluetooth remote, pairs with a Broadcom dongle */

	/* TiVo Slide Bluetooth remote, pairs with a Broadcom dongle */

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_PRO) },

	{ }

	{ }

};

};

MODULE_DEVICE_TABLE(hid, tivo_devices);

MODULE_DEVICE_TABLE(hid, tivo_devices);