diff options
| author | Gerd Knorr <devnull@localhost> | 2004-09-07 14:30:53 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-09-07 14:30:53 +0000 |
| commit | 5ab07c73b84bdc63f732509bb5b9cfd7e6942c1f (patch) | |
| tree | 13ac0525a3e17bee8315cf8a4457a24a0b2baf4c /linux | |
| parent | 8139753ae0aefca5b7ed964f853de271d74fac0a (diff) | |
| download | mediapointer-dvb-s2-5ab07c73b84bdc63f732509bb5b9cfd7e6942c1f.tar.gz mediapointer-dvb-s2-5ab07c73b84bdc63f732509bb5b9cfd7e6942c1f.tar.bz2 | |
- cx88: add connexant dvb reference design by Andrew de Quincey
- misc fixes.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 3 |
3 files changed, 20 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 0cdf14a84..658029f26 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -2868,7 +2868,8 @@ static void __devinit hauppauge_eeprom(struct bttv *btv) if (bttv_verbose) printk(KERN_INFO "bttv%d: Hauppauge eeprom: model=%d, " "tuner=%s (%d), radio=%s\n", - btv->c.nr, model, hauppauge_tuner[tuner].name, + btv->c.nr, model, (tuner < ARRAY_SIZE(hauppauge_tuner) + ? hauppauge_tuner[tuner].name : "?"), btv->tuner_type, radio ? "yes" : "no"); } diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 07ef5ab25..1e136a354 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -386,7 +386,16 @@ struct cx88_board cx88_boards[] = { #endif }, [CX88_BOARD_HAUPPAUGE_DVB_T1] = { - .name = "Hauppuage Nova-T DVB-t", + .name = "Hauppauge Nova-T DVB-T", + .tuner_type = UNSET, + .input = {{ + .type = CX88_VMUX_DVB, + .vmux = 0, + }}, + .dvb = 1, + }, + [CX88_BOARD_CONEXANT_DVB_T1] = { + .name = "Conexant DVB-T reference design", .tuner_type = UNSET, .input = {{ .type = CX88_VMUX_DVB, @@ -473,6 +482,10 @@ struct cx88_subid cx88_subids[] = { .subvendor = 0x0070, .subdevice = 0x9002, .card = CX88_BOARD_HAUPPAUGE_DVB_T1, + },{ + .subvendor = 0x14f1, + .subdevice = 0x0187, + .card = CX88_BOARD_CONEXANT_DVB_T1, } }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); @@ -590,7 +603,8 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) printk(KERN_INFO "%s: hauppauge eeprom: model=%d, " "tuner=%s (%d), radio=%s\n", - core->name, model, hauppauge_tuner[tuner].name, + core->name, model, (tuner < ARRAY_SIZE(hauppauge_tuner) + ? hauppauge_tuner[tuner].name : "?"), core->tuner_type, radio ? "yes" : "no"); } diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 8cc3a1753..207e0deb8 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.31 2004/09/06 10:40:21 kraxel Exp $ + * $Id: cx88.h,v 1.32 2004/09/07 14:30:54 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -166,6 +166,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_KWORLD_LTV883 16 #define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD 17 #define CX88_BOARD_HAUPPAUGE_DVB_T1 18 +#define CX88_BOARD_CONEXANT_DVB_T1 19 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, |