404,7 → 404,7 |
cmd |= BT848_RISC_IRQ; |
cmd |= (irqflags & 0x0f) << 16; |
cmd |= (~irqflags & 0x0f) << 20; |
mod_timer(&btv->timeout, jiffies+BTTV_TIMEOUT); |
mod_timer(&btv->timeout, jiffies26+BTTV_TIMEOUT); |
} else { |
del_timer(&btv->timeout); |
} |
498,8 → 498,8 |
if (in_interrupt()) |
BUG(); |
videobuf_waiton(&buf->vb,0,0); |
videobuf_dma_pci_unmap(btv->dev, &buf->vb.dma); |
videobuf_dma_free(&buf->vb.dma); |
//videobuf_dma_pci_unmap(btv->dev, &buf->vb.dma); |
//videobuf_dma_free(&buf->vb.dma); |
btcx_riscmem_free(btv->dev,&buf->bottom); |
btcx_riscmem_free(btv->dev,&buf->top); |
buf->vb.state = STATE_NEEDS_INIT; |
577,10 → 577,10 |
{ |
const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm; |
|
dprintk(KERN_DEBUG |
"bttv%d: buffer field: %s format: %s size: %dx%d\n", |
btv->nr, v4l2_field_names[buf->vb.field], |
buf->fmt->name, buf->vb.width, buf->vb.height); |
//dprintk(KERN_DEBUG |
// "bttv%d: buffer field: %s format: %s size: %dx%d\n", |
// btv->nr, v4l2_field_names[buf->vb.field], |
// buf->fmt->name, buf->vb.width, buf->vb.height); |
|
/* packed pixel modes */ |
if (buf->fmt->flags & FORMAT_FLAGS_PACKED) { |
731,10 → 731,10 |
struct bttv_buffer *buf) |
{ |
/* check interleave, bottom+top fields */ |
dprintk(KERN_DEBUG |
"bttv%d: overlay fields: %s format: %s size: %dx%d\n", |
btv->nr, v4l2_field_names[buf->vb.field], |
fmt->name,ov->w.width,ov->w.height); |
//dprintk(KERN_DEBUG |
// "bttv%d: overlay fields: %s format: %s size: %dx%d\n", |
// btv->nr, v4l2_field_names[buf->vb.field], |
// fmt->name,ov->w.width,ov->w.height); |
|
/* calculate geometry */ |
bttv_calc_geo(btv,&buf->geo,ov->w.width,ov->w.height, |