Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29850
b: refs/heads/master
c: 76d313b
h: refs/heads/master
v: v3
  • Loading branch information
Trent Piepho authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent c22cc9b commit 4f4eb90
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4286c6f65ec01efa8f5108cadea402ecf3b12279
refs/heads/master: 76d313bfea356550a614be51454d526e5090014d
12 changes: 6 additions & 6 deletions trunk/drivers/media/video/cx88/cx88-mpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev,
{
struct cx88_core *core = dev->core;

dprintk(0, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev->width, dev->height, buf->vb.field);
dprintk(1, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev->width, dev->height, buf->vb.field);

/* setup fifo + format */
cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
Expand Down Expand Up @@ -110,7 +110,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev,
q->count = 1;

/* enable irqs */
dprintk( 0, "setting the interrupt mask\n" );
dprintk( 1, "setting the interrupt mask\n" );
cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04);
cx_set(MO_TS_INTMSK, 0x1f0011);

Expand All @@ -123,7 +123,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev,
static int cx8802_stop_dma(struct cx8802_dev *dev)
{
struct cx88_core *core = dev->core;
dprintk( 0, "cx8802_stop_dma\n" );
dprintk( 1, "cx8802_stop_dma\n" );

/* stop dma */
cx_clear(MO_TS_DMACNTRL, 0x11);
Expand Down Expand Up @@ -205,13 +205,13 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
buf->risc.jmp[1] = cpu_to_le32(cx88q->stopper.dma);

if (list_empty(&cx88q->active)) {
dprintk( 0, "queue is empty - first active\n" );
dprintk( 1, "queue is empty - first active\n" );
list_add_tail(&buf->vb.queue,&cx88q->active);
cx8802_start_dma(dev, cx88q, buf);
buf->vb.state = STATE_ACTIVE;
buf->count = cx88q->count++;
mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
dprintk(0,"[%p/%d] %s - first active\n",
dprintk(1,"[%p/%d] %s - first active\n",
buf, buf->vb.i, __FUNCTION__);

} else {
Expand Down Expand Up @@ -245,7 +245,7 @@ static void do_cancel_buffers(struct cx8802_dev *dev, char *reason, int restart)
}
if (restart)
{
dprintk(0, "restarting queue\n" );
dprintk(1, "restarting queue\n" );
cx8802_restart_queue(dev,q);
}
spin_unlock_irqrestore(&dev->slock,flags);
Expand Down

0 comments on commit 4f4eb90

Please sign in to comment.