Commit d8ee99e7 authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

[media] mceusb: tivo transceiver should default to tivo keymap 



Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d0ff2371

drivers/media/rc/mceusb.c

+7 −1
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ enum mceusb_model_type { 
	POLARIS_EVK,

	CX_HYBRID_TV,

	MULTIFUNCTION,

	TIVO_KIT,

};



struct mceusb_model {
@@ -197,6 +198,10 @@ static const struct mceusb_model mceusb_model[] = { 
		.mce_gen2 = 1,

		.ir_intfnum = 2,

	},

	[TIVO_KIT] = {

		.mce_gen2 = 1,

		.rc_map = RC_MAP_TIVO,

	},

};



static struct usb_device_id mceusb_dev_table[] = {
@@ -308,7 +313,8 @@ static struct usb_device_id mceusb_dev_table[] = { 
	/* Northstar Systems, Inc. eHome Infrared Transceiver */

	{ USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) },

	/* TiVo PC IR Receiver */

	{ USB_DEVICE(VENDOR_TIVO, 0x2000) },

	{ USB_DEVICE(VENDOR_TIVO, 0x2000),

	  .driver_info = TIVO_KIT },

	/* Conexant Hybrid TV "Shelby" Polaris SDK */

	{ USB_DEVICE(VENDOR_CONEXANT, 0x58a1),

	  .driver_info = POLARIS_EVK },