diff options
| author | Steven Toth <stoth@hauppauge.com> | 2006-09-25 12:43:45 -0300 |
|---|---|---|
| committer | Steven Toth <stoth@hauppauge.com> | 2006-09-25 12:43:45 -0300 |
| commit | b887c4748e26f436ab35da8d0cb12baa4c0d2426 (patch) | |
| tree | abc4b860417011a1a6f58941794c9c1c37c50cc2 /linux/drivers/media/video/cx88/cx88-mpeg.c | |
| parent | 9092a672ca84b9625c2f7ed1ec5479505baffdb0 (diff) | |
| download | mediapointer-dvb-s2-b887c4748e26f436ab35da8d0cb12baa4c0d2426.tar.gz mediapointer-dvb-s2-b887c4748e26f436ab35da8d0cb12baa4c0d2426.tar.bz2 | |
Changed cx88_board .dvb and .register to an enum.
From: Steven Toth <stoth@hauppauge.com>
Some basic cleanup in preperation for a future patch where
the cx88-mpeg functions have to deal with the port being
used by multiple frontends in (mpeg2 hw encoder and dvb demod).
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-mpeg.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index b5f12bd13..1ade6a56f 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -75,8 +75,17 @@ static int cx8802_start_dma(struct cx8802_dev *dev, /* FIXME: this needs a review. * also: move to cx88-blackbird + cx88-dvb source files? */ + if (cx88_boards[core->board].mpeg == (CX88_BOARD_DVB | CX88_BOARD_BLACKBIRD) ) { + /* Report a warning until the mini driver patch is applied, + * else the following conditions will set the dma registers incorrectly. + * This will be removed in the next major patch and changes to the conditions + * will be made. + */ + printk(KERN_INFO "%s() board->(CX88_BOARD_DVB | CX88_BOARD_BLACKBIRD) is invalid\n", __FUNCTION__); + return -EINVAL; + } - if (cx88_boards[core->board].dvb) { + if (cx88_boards[core->board].mpeg & CX88_BOARD_DVB) { /* negedge driven & software reset */ cx_write(TS_GEN_CNTRL, 0x0040 | dev->ts_gen_cntrl); udelay(100); @@ -102,7 +111,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev, udelay(100); } - if (cx88_boards[core->board].blackbird) { + if (cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD) { cx_write(MO_PINMUX_IO, 0x88); /* enable MPEG parallel IO */ #if 0 |