Commit 740363fb authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: tivo: add support for BT-version (0x1200) 



Add support for BT-driven configuration of the TiVo remote.

Reported-by: default avatarJoshua Dillon <jvdillon@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6b1968d5

drivers/hid/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ config SMARTJOYPLUS_FF 


config HID_TIVO

	tristate "TiVo Slide Bluetooth remote control support"

	depends on USB_HID

	depends on (USB_HID || BT_HIDP)

	---help---

	Say Y if you have a TiVo Slide Bluetooth remote control.

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ 
#define USB_VENDOR_ID_THRUSTMASTER	0x044f



#define USB_VENDOR_ID_TIVO		0x150a

#define USB_DEVICE_ID_TIVO_SLIDE_BT	0x1200

#define USB_DEVICE_ID_TIVO_SLIDE	0x1201



#define USB_VENDOR_ID_TOPSEED		0x0766

drivers/hid/hid-tivo.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static int tivo_input_mapping(struct hid_device *hdev, struct hid_input *hi, 


static const struct hid_device_id tivo_devices[] = {

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

	{ }

};