| 74,8 → 74,8 |
|---|
| BUG(); |
| |
| videobuf_waiton(&buf->vb,0,0); |
| videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); |
| videobuf_dma_free(&buf->vb.dma); |
| //videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); |
| //videobuf_dma_free(&buf->vb.dma); |
| buf->vb.state = STATE_NEEDS_INIT; |
| } |
| |
| 283,7 → 283,7 |
|---|
| |
| if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) { |
| DEB_S(("initializing vbi...\n")); |
| result = saa7146_vbi_uops.open(dev,file); |
| result = 0;//saa7146_vbi_uops.open(dev,file); |
| } else { |
| DEB_S(("initializing video...\n")); |
| result = saa7146_video_uops.open(dev,file); |
| 319,7 → 319,7 |
|---|
| // return -ERESTARTSYS; |
| |
| if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) { |
| saa7146_vbi_uops.release(dev,file); |
| //saa7146_vbi_uops.release(dev,file); |
| } else { |
| saa7146_video_uops.release(dev,file); |
| } |
| 411,7 → 411,7 |
|---|
| } |
| case V4L2_BUF_TYPE_VBI_CAPTURE: { |
| // DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n", file, data, (unsigned long)count)); |
| return saa7146_vbi_uops.read(file,data,count,ppos); |
| return 0;//saa7146_vbi_uops.read(file,data,count,ppos); |
| } |
| break; |
| default: |
| 452,7 → 452,7 |
|---|
| return; |
| } |
| DEB_INT(("irq: RPS1 (0x%08x).\n",isr)); |
| saa7146_vbi_uops.irq_done(dev,isr); |
| //saa7146_vbi_uops.irq_done(dev,isr); |
| } |
| } |
| |
| 497,7 → 497,7 |
|---|
| memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM); |
| |
| saa7146_video_uops.init(dev,vv); |
| saa7146_vbi_uops.init(dev,vv); |
| //saa7146_vbi_uops.init(dev,vv); |
| |
| dev->vv_data = vv; |
| dev->vv_callback = &vv_callback; |
| 526,7 → 526,7 |
|---|
| DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type)); |
| |
| *vid = device_template; |
| strlcpy(vid->name, name, sizeof(vid->name)); |
| strncpy(vid->name, name, sizeof(vid->name)); |
| vid->priv = dev; |
| |
| // fixme: -1 should be an insmod parameter *for the extension* (like "video_nr"); |