aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-07-07 20:58:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:04 -0400
commite057ee11efb84e559c55e98d33acb341fe68fda1 (patch)
tree0ddcaf6adebc6082acd2cdde4e672741a1a60617 /drivers/media
parentf1798495592c1bcd7871abdc1ef2985d65c34224 (diff)
[PATCH] v4l: add TerraTec Cinergy 1400 DVB-T
Add support for TerraTec Cinergy 1400 DVB-T. Signed-off-by: Uli Luckas <luckas@musoft.de> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c15
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c3
-rw-r--r--drivers/media/video/cx88/cx88.h3
3 files changed, 18 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 75de9cab4db..eeca2f3f2a0 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * $Id: cx88-cards.c,v 1.82 2005/06/28 04:33:53 mkrufky Exp $ 2 * $Id: cx88-cards.c,v 1.84 2005/07/02 19:42:09 mkrufky Exp $
3 * 3 *
4 * device driver for Conexant 2388x based TV cards 4 * device driver for Conexant 2388x based TV cards
5 * card-specific stuff. 5 * card-specific stuff.
@@ -743,6 +743,15 @@ struct cx88_board cx88_boards[] = {
743 }}, 743 }},
744 .dvb = 1, 744 .dvb = 1,
745 }, 745 },
746 [CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1] = {
747 .name = "TerraTec Cinergy 1400 DVB-T",
748 .tuner_type = TUNER_ABSENT,
749 .input = {{
750 .type = CX88_VMUX_DVB,
751 .vmux = 0,
752 }},
753 .dvb = 1,
754 },
746}; 755};
747const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); 756const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
748 757
@@ -866,6 +875,10 @@ struct cx88_subid cx88_subids[] = {
866 .subvendor = 0x1421, 875 .subvendor = 0x1421,
867 .subdevice = 0x0334, 876 .subdevice = 0x0334,
868 .card = CX88_BOARD_ADSTECH_DVB_T_PCI, 877 .card = CX88_BOARD_ADSTECH_DVB_T_PCI,
878 },{
879 .subvendor = 0x153b,
880 .subdevice = 0x1166,
881 .card = CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1,
869 }, 882 },
870}; 883};
871const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); 884const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 206c6a0980e..806afc610d8 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * $Id: cx88-dvb.c,v 1.37 2005/06/28 23:41:47 mkrufky Exp $ 2 * $Id: cx88-dvb.c,v 1.39 2005/07/02 20:00:46 mkrufky Exp $
3 * 3 *
4 * device driver for Conexant 2388x based TV cards 4 * device driver for Conexant 2388x based TV cards
5 * MPEG Transport Stream (DVB) routines 5 * MPEG Transport Stream (DVB) routines
@@ -235,6 +235,7 @@ static int dvb_register(struct cx8802_dev *dev)
235 dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config, 235 dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config,
236 &dev->core->i2c_adap); 236 &dev->core->i2c_adap);
237 break; 237 break;
238 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
238 case CX88_BOARD_CONEXANT_DVB_T1: 239 case CX88_BOARD_CONEXANT_DVB_T1:
239 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, 240 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
240 &dev->core->i2c_adap); 241 &dev->core->i2c_adap);
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 0c5311f7e62..bc5e038bc0f 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * $Id: cx88.h,v 1.66 2005/06/22 22:58:04 mchehab Exp $ 2 * $Id: cx88.h,v 1.67 2005/07/01 12:10:07 mkrufky Exp $
3 * 3 *
4 * v4l2 device driver for cx2388x based TV cards 4 * v4l2 device driver for cx2388x based TV cards
5 * 5 *
@@ -170,6 +170,7 @@ extern struct sram_channel cx88_sram_channels[];
170#define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27 170#define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27
171#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T 28 171#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T 28
172#define CX88_BOARD_ADSTECH_DVB_T_PCI 29 172#define CX88_BOARD_ADSTECH_DVB_T_PCI 29
173#define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1 30
173 174
174enum cx88_itype { 175enum cx88_itype {
175 CX88_VMUX_COMPOSITE1 = 1, 176 CX88_VMUX_COMPOSITE1 = 1,