V4L/DVB (5371): [PATCH] Pinnacle PCTV Sat Pro USB (450e) support by ttusb2.c (400e...

Added USB_PID_PCTV_450E to the 'usb_device_id ttusb2_table' and an entry in the
.devices table.  The 400e driver now supports the 'Pinnacle PCTV Sat Pro USB
(450e)' with USB_ID 2304:0222.

Signed-off-by: Christophe Cattelain <xof@skynet.be>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 2208757d90173e55aafe001f7f3e1c57dae610c4..aa290bee6a51fa78b41d2e8e572e46c4a3a178ae 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -287,7 +287,7 @@ MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
 #define DIB0700_DEFAULT_DEVICE_PROPERTIES \
        .caps              = DVB_USB_IS_AN_I2C_ADAPTER, \
        .usb_ctrl          = DEVICE_SPECIFIC, \
-       .firmware          = "dvb-usb-dib0700-01.fw", \
+       .firmware          = "dvb-usb-dib0700-02-rc1.fw", \
        .download_firmware = dib0700_download_firmware, \
        .no_reconnect      = 1, \
        .size_of_priv      = sizeof(struct dib0700_state), \

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 148386aba2752f987ae4b2d8cbaadc4d3371cb8d..6dbf0c01e5e7e4d6a3649f626ceeb6cc4a500adb 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -127,6 +127,7 @@
 #define USB_PID_KYE_DVB_T_WARM                         0x701f
 #define USB_PID_PCTV_200E                              0x020e
 #define USB_PID_PCTV_400E                              0x020f
+#define USB_PID_PCTV_450E                              0x0222
 #define USB_PID_LITEON_DVB_T_COLD                      0xf000
 #define USB_PID_LITEON_DVB_T_WARM                      0xf001
 #define USB_PID_DIGIVOX_MINI_SL_COLD                   0xe360

diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c
index 95d29976ed78224c066598858948f472276a9fea..88dc4367a2e329e95d6eeb9ded0604268bfeaa5d 100644 (file)
--- a/drivers/media/dvb/dvb-usb/ttusb2.c
+++ b/drivers/media/dvb/dvb-usb/ttusb2.c
@@ -184,6 +184,7 @@ static int ttusb2_probe(struct usb_interface *intf,
 
 static struct usb_device_id ttusb2_table [] = {
                { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_400E) },
+               { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_450E) },
                {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, ttusb2_table);
@@ -227,12 +228,16 @@ static struct dvb_usb_device_properties ttusb2_properties = {
 
        .generic_bulk_ctrl_endpoint = 0x01,
 
-       .num_device_descs = 1,
+       .num_device_descs = 2,
        .devices = {
                {   "Pinnacle 400e DVB-S USB2.0",
                        { &ttusb2_table[0], NULL },
                        { NULL },
                },
+               {   "Pinnacle 450e DVB-S USB2.0",
+                       { &ttusb2_table[1], NULL },
+                       { NULL },
+               },
        }
 };