diff options
| author | Gerd Knorr <devnull@localhost> | 2005-03-07 14:18:00 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-03-07 14:18:00 +0000 |
| commit | a536730c24efdd1bd3de43ebd94939d0b79f3b05 (patch) | |
| tree | b8bcd695a61b03346d46f9413db186a0d8a9f398 /linux/drivers/media | |
| parent | 77f714ee869194e214df2fed794d14949a4b008b (diff) | |
| download | mediapointer-dvb-s2-a536730c24efdd1bd3de43ebd94939d0b79f3b05.tar.gz mediapointer-dvb-s2-a536730c24efdd1bd3de43ebd94939d0b79f3b05.tar.bz2 | |
- fix cx88-dvb.
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 27 |
2 files changed, 11 insertions, 20 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index e62067fbd..3d18d14ec 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.29 2005/02/18 13:26:20 kraxel Exp $ + * $Id: cx88-dvb.c,v 1.30 2005/03/07 14:18:00 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -203,7 +203,7 @@ static int dvb_register(struct cx8802_dev *dev) { /* init struct videobuf_dvb */ dev->dvb.name = dev->core->name; - dev->ts_gen_cntrl = 0xc0; + dev->ts_gen_cntrl = 0x0c; /* init frontend */ switch (dev->core->board) { diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 17c37a039..28ad23d99 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.24 2005/03/07 12:01:51 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.25 2005/03/07 14:18:00 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -69,23 +69,14 @@ static int cx8802_start_dma(struct cx8802_dev *dev, * also: move to cx88-blackbird + cx88-dvb source files? */ if (cx88_boards[core->board].dvb) { - dprintk(0, "dvb: ts_gen_cntrl=0x%02x", dev->ts_gen_cntrl); - switch (core->board) { - case CX88_BOARD_PCHDTV_HD3000: - /* negedge driven & software reset */ - cx_write(TS_GEN_CNTRL, 0x40); - udelay(100); - cx_write(MO_PINMUX_IO, 0x00); - cx_write(TS_HW_SOP_CNTRL,47<<16|188<<4|0x00); - cx_write(TS_SOP_STAT,0x00); - cx_write(TS_GEN_CNTRL, dev->ts_gen_cntrl); - udelay(100); - break; - default: -// cx_write(TS_GEN_CNTRL, dev->ts_gen_cntrl); - cx_write(TS_GEN_CNTRL, 0xc0); - break; - } + /* negedge driven & software reset */ + cx_write(TS_GEN_CNTRL, 0x40); + udelay(100); + cx_write(MO_PINMUX_IO, 0x00); + cx_write(TS_HW_SOP_CNTRL,47<<16|188<<4|0x00); + cx_write(TS_SOP_STAT,0x00); + cx_write(TS_GEN_CNTRL, dev->ts_gen_cntrl); + udelay(100); } if (cx88_boards[core->board].blackbird) { |