From edd4507a9edff255a67ce707442560a4ec4b3b14 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Wed, 13 Oct 2004 10:38:59 +0000 Subject: - kill trailing whitespaces. --- linux/drivers/media/video/cx88/cx88-mpeg.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'linux/drivers/media/video/cx88/cx88-mpeg.c') diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index ff1a27978..7df7bd412 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,9 +1,9 @@ /* - * $Id: cx88-mpeg.c,v 1.11 2004/10/12 07:33:22 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.12 2004/10/13 10:39:00 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. - * + * * (c) 2004 Jelle Foks * (c) 2004 Chris Pascoe * (c) 2004 Gerd Knorr @@ -53,9 +53,9 @@ static int cx8802_start_dma(struct cx8802_dev *dev, struct cx88_buffer *buf) { struct cx88_core *core = dev->core; - + dprintk(1, "cx8802_start_mpegport_dma %d\n", buf->vb.width); - + /* setup fifo + format */ cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28], dev->ts_packet_size, buf->risc.dma); @@ -74,15 +74,15 @@ static int cx8802_start_dma(struct cx8802_dev *dev, if (cx88_boards[core->board].blackbird) { cx_write(MO_PINMUX_IO, 0x88); /* enable MPEG parallel IO */ - + // cx_write(TS_F2_CMD_STAT_MM, 0x2900106); /* F2_CMD_STAT_MM defaults + master + memory space */ - cx_write(TS_GEN_CNTRL, 0x46); /* punctured clock TS & posedge driven & software reset */ + cx_write(TS_GEN_CNTRL, 0x46); /* punctured clock TS & posedge driven & software reset */ udelay(100); - + cx_write(TS_HW_SOP_CNTRL, 0x408); /* mpeg start byte */ //cx_write(TS_HW_SOP_CNTRL, 0x2F0BC0); /* mpeg start byte ts: 0x2F0BC0 ? */ cx_write(TS_VALERR_CNTRL, 0x2000); - + cx_write(TS_GEN_CNTRL, 0x06); /* punctured clock TS & posedge driven */ udelay(100); } @@ -91,11 +91,11 @@ static int cx8802_start_dma(struct cx8802_dev *dev, /* reset counter */ cx_write(MO_TS_GPCNTRL, GP_COUNT_CONTROL_RESET); q->count = 1; - + /* enable irqs */ cx_set(MO_PCI_INTMSK, 0x00fc04); cx_write(MO_TS_INTMSK, 0x1f0011); - + /* start dma */ cx_write(MO_DEV_CNTRL2, (1<<5)); /* FIXME: s/write/set/ ??? */ cx_write(MO_TS_DMACNTRL, 0x11); @@ -159,7 +159,7 @@ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf) if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL))) goto fail; cx88_risc_databuffer(dev->pci, &buf->risc, - buf->vb.dma.sglist, + buf->vb.dma.sglist, buf->vb.width, buf->vb.height); } buf->vb.state = STATE_PREPARED; @@ -252,7 +252,7 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev) mask = cx_read(MO_TS_INTMSK); if (0 == (status & mask)) return; - + cx_write(MO_TS_INTSTAT, status); if (debug || (status & mask & ~0xff)) cx88_print_irqbits(core->name, "irq mpeg ", @@ -316,7 +316,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs) core->name); cx_write(MO_PCI_INTMSK,0); } - + out: return IRQ_RETVAL(handled); } @@ -386,7 +386,7 @@ void cx8802_fini_common(struct cx8802_dev *dev) cx8802_stop_dma(dev); pci_disable_device(dev->pci); - /* unregister stuff */ + /* unregister stuff */ free_irq(dev->pci->irq, dev); pci_set_drvdata(dev->pci, NULL); @@ -414,7 +414,7 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, u32 state) /* FIXME -- shutdown device */ cx88_shutdown(dev->core); #endif - + pci_save_state(pci_dev, dev->state.pci_cfg); if (0 != pci_set_power_state(pci_dev, state)) { pci_disable_device(pci_dev); -- cgit v1.2.3