Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 13415
b: refs/heads/master
c: 3b64e8e
h: refs/heads/master
i:
  13413: d41efff
  13411: c9088ce
  13407: 675efe5
v: v3
  • Loading branch information
Michael Krufky authored and Linus Torvalds committed Nov 9, 2005
1 parent 4501f8b commit ba1f8d8
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f4372beb84874ab33f2b06bd6a66ff6d07427081
refs/heads/master: 3b64e8e238217ebd3d847ca19ead631124a2ed14
12 changes: 11 additions & 1 deletion trunk/drivers/media/video/saa7134/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config VIDEO_SAA7134
module will be called saa7134.

config VIDEO_SAA7134_DVB
tristate "DVB Support for saa7134 based TV cards"
tristate "DVB/ATSC Support for saa7134 based TV cards"
depends on VIDEO_SAA7134 && DVB_CORE
select VIDEO_BUF_DVB
---help---
Expand All @@ -32,6 +32,7 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS
depends on VIDEO_SAA7134_DVB
select DVB_MT352
select DVB_TDA1004X
select DVB_NXT200X
---help---
This builds saa7134-dvb with all currently supported frontend
demodulators. If you wish to tweak your configuration, and
Expand All @@ -56,3 +57,12 @@ config VIDEO_SAA7134_DVB_TDA1004X
---help---
This adds DVB-T support for cards based on the
Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.

config VIDEO_SAA7134_DVB_NXT200X
tristate "NXT2002/NXT2004 ATSC Support"
default m
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_NXT200X
---help---
This adds ATSC 8VSB and QAM64/256 support for cards based on the
Philips saa7134 chip and the NXT2002/NXT2004 demodulator.
3 changes: 3 additions & 0 deletions trunk/drivers/media/video/saa7134/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ endif
ifneq ($(CONFIG_DVB_TDA1004X),n)
EXTRA_CFLAGS += -DHAVE_TDA1004X=1
endif
ifneq ($(CONFIG_DVB_NXT200X),n)
EXTRA_CFLAGS += -DHAVE_NXT200X=1
endif
1 change: 1 addition & 0 deletions trunk/drivers/media/video/saa7134/saa7134-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -2358,6 +2358,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_comp1,
.vmux = 3,
Expand Down
17 changes: 17 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
#ifdef HAVE_TDA1004X
# include "tda1004x.h"
#endif
#ifdef HAVE_NXT200X
# include "nxt200x.h"
# include "dvb-pll.h"
#endif

MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
MODULE_LICENSE("GPL");
Expand Down Expand Up @@ -624,6 +628,14 @@ static struct tda1004x_config tda827x_lifeview_config = {
};
#endif

#ifdef HAVE_NXT200X
static struct nxt200x_config avertvhda180 = {
.demod_address = 0x0a,
.pll_address = 0x61,
.pll_desc = &dvb_pll_tdhu2,
};
#endif

/* ------------------------------------------------------------------ */

static int dvb_init(struct saa7134_dev *dev)
Expand Down Expand Up @@ -676,6 +688,11 @@ static int dvb_init(struct saa7134_dev *dev)
dev->dvb.frontend = tda10046_attach(&philips_tu1216_61_config,
&dev->i2c_adap);
break;
#endif
#ifdef HAVE_NXT200X
case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
break;
#endif
default:
printk("%s: Huh? unknown DVB card?\n",dev->name);
Expand Down

0 comments on commit ba1f8d8

Please sign in to comment.