diff options
| author | Steven Toth <stoth@hauppauge.com> | 2007-03-19 16:46:03 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@hauppauge.com> | 2007-03-19 16:46:03 -0400 |
| commit | 3d98060a3136fcb456f71f9aac317125420e8a02 (patch) | |
| tree | 75090a3710f1962a3f7e5f07a8de3a56124f8447 /linux/drivers | |
| parent | c68e2dfc34ffd228239e64d37a8193945d86c56e (diff) | |
| download | mediapointer-dvb-s2-3d98060a3136fcb456f71f9aac317125420e8a02.tar.gz mediapointer-dvb-s2-3d98060a3136fcb456f71f9aac317125420e8a02.tar.bz2 | |
NMI hang and corrupt transport packet fixes
From: Steven Toth <stoth@hauppauge.com>
The sram allocations for the cx23887 differ slightly from the cx23885.
This patch modifies the cx23887 specific sram memory map to reflect this.
As a result, interrupts and DMA handling have also been enabled in
cx23885_start_dma() for 887 specific boards.
ATSC streaming is now available on cx23885 and cx23887 bridges.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index 2d1a4e37d..f3b4e84e2 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -271,7 +271,7 @@ struct sram_channel cx23887_sram_channels[] = { .name = "TS2 C", .cmds_start = 0x10140, .ctrl_start = 0x10680, - .cdt = 0x10480, + .cdt = 0x108d0, .fifo_start = 0x6000, .fifo_size = 0x1000, .ptr1_reg = DMA5_PTR1, @@ -1110,16 +1110,13 @@ static int cx23885_start_dma(struct cx23885_tsport *port, */ switch(cx23885_boards[dev->board].bridge) { case CX23885_BRIDGE_885: + case CX23885_BRIDGE_887: /* enable irqs */ dprintk(1, "%s() enabling TS int's and DMA\n", __FUNCTION__ ); cx_set(port->reg_ts_int_msk, port->ts_int_msk_val); cx_set(port->reg_dma_ctl, port->dma_ctl_val); cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask); break; - case CX23885_BRIDGE_887: - // FIXME - dprintk(1, "%s() NOT enabling TS int's and DMA, NMI bug\n", __FUNCTION__ ); - break; default: // FIXME: generate a sensible switch-default message printk(KERN_ERR "%s() error, default case", __FUNCTION__ ); |