1 files changed, 37 insertions, 4 deletions

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 55802fba3c29..eca4082a61ae 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -28,6 +28,17 @@ static struct usb_device_id dibusb_dib3000mc_table [] = {
 /* 00 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3001_COLD) },
 /* 01 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3001_WARM) },
 /* 02 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+/* 03 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
+/* 04 */        { USB_DEVICE(USB_VID_LITEON,            USB_PID_LITEON_DVB_T_COLD) },
+/* 05 */        { USB_DEVICE(USB_VID_LITEON,            USB_PID_LITEON_DVB_T_WARM) },
+/* 06 */        { USB_DEVICE(USB_VID_EMPIA,             USB_PID_DIGIVOX_MINI_SL_COLD) },
+/* 07 */        { USB_DEVICE(USB_VID_EMPIA,             USB_PID_DIGIVOX_MINI_SL_WARM) },
+/* 08 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
+/* 09 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
+/* 10 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_COLD) },
+/* 11 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_WARM) },
+/* 12 */        { USB_DEVICE(USB_VID_LEADTEK,           USB_PID_WINFAST_DTV_DONGLE_COLD) },
+/* 13 */        { USB_DEVICE(USB_VID_LEADTEK,           USB_PID_WINFAST_DTV_DONGLE_WARM) },
                         { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
@@ -50,7 +61,7 @@ static struct dvb_usb_properties dibusb_mc_properties = {
 
         .rc_interval      = DEFAULT_RC_INTERVAL,
         .rc_key_map       = dibusb_rc_keys,
-        .rc_key_map_size  = 63, /* FIXME */
+        .rc_key_map_size  = 111, /* FIXME */
         .rc_query         = dibusb_rc_query,
 
         .i2c_algo         = &dibusb_i2c_algo,
@@ -68,16 +79,38 @@ static struct dvb_usb_properties dibusb_mc_properties = {
                 }
         },
 
-        .num_device_descs = 2,
+        .num_device_descs = 7,
         .devices = {
                 {   "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
                         { &dibusb_dib3000mc_table[0], NULL },
                         { &dibusb_dib3000mc_table[1], NULL },
                 },
-                {   "Artec T1 USB2.0 TVBOX (please report the warm ID)",
+                {   "Artec T1 USB2.0 TVBOX (please check the warm ID)",
                         { &dibusb_dib3000mc_table[2], NULL },
-                        { NULL },
+                        { &dibusb_dib3000mc_table[3], NULL },
                 },
+                {   "LITE-ON USB2.0 DVB-T Tuner",
+                    /* Also rebranded as Intuix S800, Toshiba */
+                        { &dibusb_dib3000mc_table[4], NULL },
+                        { &dibusb_dib3000mc_table[5], NULL },
+                },
+                {   "MSI Digivox Mini SL",
+                        { &dibusb_dib3000mc_table[6], NULL },
+                        { &dibusb_dib3000mc_table[7], NULL },
+                },
+                {   "GRAND - USB2.0 DVB-T adapter",
+                        { &dibusb_dib3000mc_table[8], NULL },
+                        { &dibusb_dib3000mc_table[9], NULL },
+                },
+                {   "Artec T14 - USB2.0 DVB-T",
+                        { &dibusb_dib3000mc_table[10], NULL },
+                        { &dibusb_dib3000mc_table[11], NULL },
+                },
+                {   "Leadtek - USB2.0 Winfast DTV dongle",
+                        { &dibusb_dib3000mc_table[12], NULL },
+                        { &dibusb_dib3000mc_table[13], NULL },
+                },
+                { NULL },
         }
 };