diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 21:10:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 21:10:26 -0300 |
| commit | 299225379cd2a1d3bf6de810ff49382f96a02d11 (patch) | |
| tree | 23455ba035a926ae3178977dee3f0a5126c64cd2 /linux/drivers/media/video/saa7134/saa7134-ts.c | |
| parent | 02b5c443f53867b693751a9aff1753ffea8891d4 (diff) | |
| parent | ea09aea560cb0eabd0221c64177257a11e3e6d83 (diff) | |
| download | mediapointer-dvb-s2-299225379cd2a1d3bf6de810ff49382f96a02d11.tar.gz mediapointer-dvb-s2-299225379cd2a1d3bf6de810ff49382f96a02d11.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/lgdt3305
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-ts.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-ts.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-ts.c b/linux/drivers/media/video/saa7134/saa7134-ts.c index ef55a59f0..cc8b923af 100644 --- a/linux/drivers/media/video/saa7134/saa7134-ts.c +++ b/linux/drivers/media/video/saa7134/saa7134-ts.c @@ -79,8 +79,19 @@ static int buffer_activate(struct saa7134_dev *dev, saa_writeb(SAA7134_TS_SERIAL1, 0x00); /* Start TS stream */ - saa_writeb(SAA7134_TS_SERIAL0, 0x40); - saa_writeb(SAA7134_TS_PARALLEL, 0xEC); + switch (saa7134_boards[dev->board].ts_type) { + case SAA7134_MPEG_TS_PARALLEL: + saa_writeb(SAA7134_TS_SERIAL0, 0x40); + saa_writeb(SAA7134_TS_PARALLEL, 0xec); + break; + case SAA7134_MPEG_TS_SERIAL: + saa_writeb(SAA7134_TS_SERIAL0, 0xd8); + saa_writeb(SAA7134_TS_PARALLEL, 0x6c); + saa_writeb(SAA7134_TS_PARALLEL_SERIAL, 0xbc); + saa_writeb(SAA7134_TS_SERIAL1, 0x02); + break; + } + dev->ts_state = SAA7134_TS_STARTED; } |