diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 14a3be1f4..a1c3ab74a 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.30 2004/10/25 11:26:35 kraxel Exp $ + $Id: bttv-cards.c,v 1.31 2004/10/27 18:34:55 kraxel Exp $ bttv-cards.c @@ -184,7 +184,6 @@ static struct CARD { { 0xd01810fc, BTTV_GVBCTV5PCI, "I-O Data Co. GV-BCTV5/PCI" }, { 0x001211bd, BTTV_PINNACLE, "Pinnacle PCTV" }, - { 0x001c11bd, BTTV_PINNACLESAT, "Pinnacle PCTV Sat" }, // some cards ship with byteswapped IDs ... { 0x1200bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, { 0xff00bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, @@ -307,6 +306,7 @@ static struct CARD { // DVB cards (using pci function .1 for mpeg data xfer) { 0x01010071, BTTV_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, { 0x07611461, BTTV_AVDVBT_761, "AverMedia AverTV DVB-T" }, + { 0x001c11bd, BTTV_PINNACLESAT, "Pinnacle PCTV Sat" }, { 0x002611bd, BTTV_TWINHAN_DST, "Pinnacle PCTV SAT CI" }, { 0x00011822, BTTV_TWINHAN_DST, "Twinhan VisionPlus DVB-T" }, { 0xfc00270f, BTTV_TWINHAN_DST, "ChainTech digitop DST-1000 DVB-S" }, @@ -1671,6 +1671,7 @@ struct tvcard bttv_tvcards[] = { .needs_tvaudio = 0, .pll = PLL_28, .no_gpioirq = 1, + .has_dvb = 1, },{ .name = "Formac ProTV II (bt878)", .video_inputs = 4, @@ -2968,40 +2969,6 @@ static int __devinit pvr_altera_load(struct bttv *btv, u8 *micro, u32 microlen) return 0; } -#if !defined(CONFIG_FW_LOADER) && !defined(CONFIG_FW_LOADER_MODULE) -/* old 2.4.x way -- via soundcore's mod_firmware_load */ - -static char *firm_altera = "/usr/lib/video4linux/hcwamc.rbf"; -MODULE_PARM(firm_altera,"s"); -MODULE_PARM_DESC(firm_altera,"WinTV/PVR firmware " - "(driver CD => unzip pvr45xxx.exe => hcwamc.rbf)"); - -extern int mod_firmware_load(const char *fn, char **fp); - -int __devinit pvr_boot(struct bttv *btv) -{ - u32 microlen; - u8 *micro; - int result; - - microlen = mod_firmware_load(firm_altera, (char**) µ); - if (!microlen) { - printk(KERN_WARNING "bttv%d: altera firmware not found [%s]\n", - btv->c.nr, firm_altera); - return -1; - } - - printk(KERN_INFO "bttv%d: uploading altera firmware [%s] ...\n", - btv->c.nr, firm_altera); - result = pvr_altera_load(btv, micro, microlen); - printk(KERN_INFO "bttv%d: ... upload %s\n", - btv->c.nr, (result < 0) ? "failed" : "ok"); - vfree(micro); - return result; -} -#else -/* new 2.5.x way -- via hotplug firmware loader */ - int __devinit pvr_boot(struct bttv *btv) { const struct firmware *fw_entry; @@ -3023,7 +2990,6 @@ int __devinit pvr_boot(struct bttv *btv) release_firmware(fw_entry); return rc; } -#endif /* ----------------------------------------------------------------------- */ /* some osprey specific stuff */ |