[media] mceusb: tivo transceiver should default to tivo keymap
authorJarod Wilson <jarod@redhat.com>
Thu, 24 Mar 2011 15:59:10 +0000 (12:59 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 20 May 2011 12:27:31 +0000 (09:27 -0300)
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/rc/mceusb.c

index 0c273ec..9145be9 100644 (file)
@@ -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 },