1,3 → 1,5 |
#include <linuxcomp.h> |
|
#include <media/saa7146_vv.h> |
|
#define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) |
16,12 → 18,12 |
|
/* is it free? */ |
DEB_D(("getting lock...\n")); |
down(&dev->lock); |
//down(&dev->lock); |
DEB_D(("got lock\n")); |
if (vv->resources & bit) { |
DEB_D(("locked! vv->resources:0x%02x, we want:0x%02x\n",vv->resources,bit)); |
/* no, someone else uses it */ |
up(&dev->lock); |
//up(&dev->lock); |
return 0; |
} |
/* it's free, grab it */ |
28,7 → 30,7 |
fh->resources |= bit; |
vv->resources |= bit; |
DEB_D(("res: get %d\n",bit)); |
up(&dev->lock); |
//up(&dev->lock); |
return 1; |
} |
|
52,12 → 54,12 |
BUG(); |
|
DEB_D(("getting lock...\n")); |
down(&dev->lock); |
//down(&dev->lock); |
DEB_D(("got lock\n")); |
fh->resources &= ~bits; |
vv->resources &= ~bits; |
DEB_D(("res: put %d\n",bits)); |
up(&dev->lock); |
//up(&dev->lock); |
} |
|
|
129,8 → 131,8 |
} |
|
q->curr->vb.state = state; |
do_gettimeofday(&q->curr->vb.ts); |
wake_up(&q->curr->vb.done); |
//do_gettimeofday(&q->curr->vb.ts); |
//wake_up(&q->curr->vb.done); |
|
q->curr = NULL; |
} |
232,8 → 234,8 |
|
DEB_EE(("inode:%p, file:%p, minor:%d\n",inode,file,minor)); |
|
if (down_interruptible(&saa7146_devices_lock)) |
return -ERESTARTSYS; |
//if (down_interruptible(&saa7146_devices_lock)) |
// return -ERESTARTSYS; |
|
list_for_each(list,&saa7146_devices) { |
h = list_entry(list, struct saa7146_dev, item); |
302,7 → 304,7 |
kfree(fh); |
file->private_data = NULL; |
} |
up(&saa7146_devices_lock); |
//up(&saa7146_devices_lock); |
return result; |
} |
|
313,8 → 315,8 |
|
DEB_EE(("inode:%p, file:%p\n",inode,file)); |
|
if (down_interruptible(&saa7146_devices_lock)) |
return -ERESTARTSYS; |
//if (down_interruptible(&saa7146_devices_lock)) |
// return -ERESTARTSYS; |
|
if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) { |
saa7146_vbi_uops.release(dev,file); |
326,7 → 328,7 |
file->private_data = NULL; |
kfree(fh); |
|
up(&saa7146_devices_lock); |
//up(&saa7146_devices_lock); |
|
return 0; |
} |
445,7 → 447,7 |
u32 mc2 = saa7146_read(dev, MC2); |
if( 0 != (mc2 & MASK_15)) { |
DEB_INT(("irq: RPS1 vbi workaround (0x%08x).\n",isr)); |
wake_up(&dev->vv_data->vbi_wq); |
//wake_up(&dev->vv_data->vbi_wq); |
saa7146_write(dev,MC2, MASK_31); |
return; |
} |