Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 620 → Rev 621

/shark/trunk/drivers/bttv/bttv-driver.c
1495,7 → 1495,6
return -EINVAL;
if (v->norm >= BTTV_TVNORMS)
return -EINVAL;
 
//down(&btv->lock);
if (channel == btv->input &&
v->norm == btv->tvnorm) {
2230,9 → 2229,6
const struct bttv_format *fmt;
unsigned long end;
 
if(!capable(CAP_SYS_ADMIN) &&
!capable(CAP_SYS_RAWIO))
return -EPERM;
end = (unsigned long)fbuf->base +
fbuf->height * fbuf->bytesperline;
//down(&fh->cap.lock);
2568,10 → 2564,6
struct v4l2_framebuffer *fb = arg;
const struct bttv_format *fmt;
if(!capable(CAP_SYS_ADMIN) &&
!capable(CAP_SYS_RAWIO))
return -EPERM;
 
/* check args */
fmt = format_by_fourcc(fb->fmt.pixelformat);
if (NULL == fmt)
2862,7 → 2854,6
for (i = 0; i < bttv_num; i++) {
if (bttvs[i].video_dev->minor == minor) {
btv = &bttvs[i];
bttv_reinit_bt848(btv);
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
break;
}
2907,7 → 2898,7
btv->users++;
//if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type)
//bttv_vbi_setlines(fh,btv,16);
bttv_field_count(btv);
//bttv_field_count(btv);
return 0;
}
 
2946,7 → 2937,7
kfree(fh);
 
btv->users--;
bttv_field_count(btv);
//bttv_field_count(btv);
return 0;
}
 
/shark/trunk/drivers/bttv/bttv-risc.c
404,9 → 404,9
cmd |= BT848_RISC_IRQ;
cmd |= (irqflags & 0x0f) << 16;
cmd |= (~irqflags & 0x0f) << 20;
mod_timer(&btv->timeout, jiffies26+BTTV_TIMEOUT);
//mod_timer(&btv->timeout, jiffies26+BTTV_TIMEOUT);
} else {
del_timer(&btv->timeout);
//del_timer(&btv->timeout);
}
btv->main.cpu[RISC_SLOT_LOOP] = cpu_to_le32(cmd);
497,7 → 497,7
{
//if (in_interrupt())
// BUG();
videobuf_waiton(&buf->vb,0,0);
//videobuf_waiton(&buf->vb,0,0);
//videobuf_dma_pci_unmap(btv->dev, &buf->vb.dma);
//videobuf_dma_free(&buf->vb.dma);
btcx_riscmem_free(btv->dev,&buf->bottom);