Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ddc9ece89dbeb374e34772232f5e26f64ce63390
Commit:     ddc9ece89dbeb374e34772232f5e26f64ce63390
Parent:     ede2200d79777d461cf2f0fd19cf7a17f633d3a4
Author:     Christophe Cattelain <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 27 12:31:32 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:44:08 2007 -0300

    V4L/DVB (5371): [PATCH] Pinnacle PCTV Sat Pro USB (450e) support by 
ttusb2.c (400e driver)
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Patrick Boettcher <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/dvb/dvb-usb/dib0700_devices.c |    2 +-
 drivers/media/dvb/dvb-usb/dvb-usb-ids.h     |    1 +
 drivers/media/dvb/dvb-usb/ttusb2.c          |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c 
b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 2208757..aa290be 100644
--- 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 148386a..6dbf0c0 100644
--- 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 95d2997..88dc436 100644
--- 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 },
+               },
        }
 };
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to