Commit 868bec44 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] v4l: #1 - video-buf update

From: Gerd Knorr <kraxel@bytesex.org>

This minor patch updates the video-buf module.  It just adds a export
for the videobuf_next_field function and adds some debug printk's.
parent 98063ca7
...@@ -362,22 +362,34 @@ videobuf_queue_is_busy(struct videobuf_queue *q) ...@@ -362,22 +362,34 @@ videobuf_queue_is_busy(struct videobuf_queue *q)
{ {
int i; int i;
if (q->reading) if (q->streaming) {
dprintk(1,"busy: streaming active\n");
return 1; return 1;
if (q->streaming) }
if (q->reading) {
dprintk(1,"busy: pending read #1\n");
return 1; return 1;
if (q->read_buf) }
if (q->read_buf) {
dprintk(1,"busy: pending read #2\n");
return 1; return 1;
}
for (i = 0; i < VIDEO_MAX_FRAME; i++) { for (i = 0; i < VIDEO_MAX_FRAME; i++) {
if (NULL == q->bufs[i]) if (NULL == q->bufs[i])
continue; continue;
if (q->bufs[i]->map) if (q->bufs[i]->map) {
dprintk(1,"busy: buffer #%d mapped\n",i);
return 1; return 1;
if (q->bufs[i]->state == STATE_QUEUED) }
if (q->bufs[i]->state == STATE_QUEUED) {
dprintk(1,"busy: buffer #%d queued\n",i);
return 1; return 1;
if (q->bufs[i]->state == STATE_ACTIVE) }
if (q->bufs[i]->state == STATE_ACTIVE) {
dprintk(1,"busy: buffer #%d avtive\n",i);
return 1; return 1;
} }
}
return 0; return 0;
} }
...@@ -569,7 +581,7 @@ videobuf_dqbuf(struct file *file, struct videobuf_queue *q, ...@@ -569,7 +581,7 @@ videobuf_dqbuf(struct file *file, struct videobuf_queue *q,
if (list_empty(&q->stream)) if (list_empty(&q->stream))
goto done; goto done;
buf = list_entry(q->stream.next, struct videobuf_buffer, stream); buf = list_entry(q->stream.next, struct videobuf_buffer, stream);
retval = videobuf_waiton(buf,1,1); retval = videobuf_waiton(buf, file->f_flags & O_NONBLOCK, 1);
if (retval < 0) if (retval < 0)
goto done; goto done;
switch (buf->state) { switch (buf->state) {
...@@ -925,6 +937,9 @@ static void ...@@ -925,6 +937,9 @@ static void
videobuf_vm_open(struct vm_area_struct *vma) videobuf_vm_open(struct vm_area_struct *vma)
{ {
struct videobuf_mapping *map = vma->vm_private_data; struct videobuf_mapping *map = vma->vm_private_data;
dprintk(2,"vm_open %p [count=%d,vma=%08lx-%08lx]\n",map,
map->count,vma->vm_start,vma->vm_end);
map->count++; map->count++;
} }
...@@ -934,6 +949,9 @@ videobuf_vm_close(struct vm_area_struct *vma) ...@@ -934,6 +949,9 @@ videobuf_vm_close(struct vm_area_struct *vma)
struct videobuf_mapping *map = vma->vm_private_data; struct videobuf_mapping *map = vma->vm_private_data;
int i; int i;
dprintk(2,"vm_close %p [count=%d,vma=%08lx-%08lx]\n",map,
map->count,vma->vm_start,vma->vm_end);
/* down(&fh->lock); FIXME */ /* down(&fh->lock); FIXME */
map->count--; map->count--;
if (0 == map->count) { if (0 == map->count) {
...@@ -1119,6 +1137,7 @@ EXPORT_SYMBOL_GPL(videobuf_queue_init); ...@@ -1119,6 +1137,7 @@ EXPORT_SYMBOL_GPL(videobuf_queue_init);
EXPORT_SYMBOL_GPL(videobuf_queue_cancel); EXPORT_SYMBOL_GPL(videobuf_queue_cancel);
EXPORT_SYMBOL_GPL(videobuf_queue_is_busy); EXPORT_SYMBOL_GPL(videobuf_queue_is_busy);
EXPORT_SYMBOL_GPL(videobuf_next_field);
EXPORT_SYMBOL_GPL(videobuf_status); EXPORT_SYMBOL_GPL(videobuf_status);
EXPORT_SYMBOL_GPL(videobuf_reqbufs); EXPORT_SYMBOL_GPL(videobuf_reqbufs);
EXPORT_SYMBOL_GPL(videobuf_querybuf); EXPORT_SYMBOL_GPL(videobuf_querybuf);
......
...@@ -196,6 +196,7 @@ void videobuf_queue_init(struct videobuf_queue *q, ...@@ -196,6 +196,7 @@ void videobuf_queue_init(struct videobuf_queue *q,
int videobuf_queue_is_busy(struct videobuf_queue *q); int videobuf_queue_is_busy(struct videobuf_queue *q);
void videobuf_queue_cancel(struct file *file, struct videobuf_queue *q); void videobuf_queue_cancel(struct file *file, struct videobuf_queue *q);
enum v4l2_field videobuf_next_field(struct videobuf_queue *q);
void videobuf_status(struct v4l2_buffer *b, struct videobuf_buffer *vb, void videobuf_status(struct v4l2_buffer *b, struct videobuf_buffer *vb,
enum v4l2_buf_type type); enum v4l2_buf_type type);
int videobuf_reqbufs(struct file *file, struct videobuf_queue *q, int videobuf_reqbufs(struct file *file, struct videobuf_queue *q,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment