You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
V4L/DVB: v4l: videobuf: code cleanup
Make videobuf pass checkpatch; minor code cleanups. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Pawel Osciak
committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
parent
85e092190b
commit
7a02264ca9
@@ -24,10 +24,15 @@
|
||||
#include <media/videobuf-core.h>
|
||||
|
||||
#define MAGIC_BUFFER 0x20070728
|
||||
#define MAGIC_CHECK(is, should) do { \
|
||||
if (unlikely((is) != (should))) { \
|
||||
printk(KERN_ERR "magic mismatch: %x (expected %x)\n", is, should); \
|
||||
BUG(); } } while (0)
|
||||
#define MAGIC_CHECK(is, should) \
|
||||
do { \
|
||||
if (unlikely((is) != (should))) { \
|
||||
printk(KERN_ERR \
|
||||
"magic mismatch: %x (expected %x)\n", \
|
||||
is, should); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
@@ -36,9 +41,11 @@ MODULE_DESCRIPTION("helper module to manage video4linux buffers");
|
||||
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#define dprintk(level, fmt, arg...) do { \
|
||||
if (debug >= level) \
|
||||
printk(KERN_DEBUG "vbuf: " fmt , ## arg); } while (0)
|
||||
#define dprintk(level, fmt, arg...) \
|
||||
do { \
|
||||
if (debug >= level) \
|
||||
printk(KERN_DEBUG "vbuf: " fmt, ## arg); \
|
||||
} while (0)
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
@@ -57,14 +64,14 @@ void *videobuf_alloc(struct videobuf_queue *q)
|
||||
}
|
||||
|
||||
vb = q->int_ops->alloc(q->msize);
|
||||
|
||||
if (NULL != vb) {
|
||||
init_waitqueue_head(&vb->done);
|
||||
vb->magic = MAGIC_BUFFER;
|
||||
vb->magic = MAGIC_BUFFER;
|
||||
}
|
||||
|
||||
return vb;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_alloc);
|
||||
|
||||
#define WAITON_CONDITION (vb->state != VIDEOBUF_ACTIVE &&\
|
||||
vb->state != VIDEOBUF_QUEUED)
|
||||
@@ -86,6 +93,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr)
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_waiton);
|
||||
|
||||
int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
|
||||
struct v4l2_framebuffer *fbuf)
|
||||
@@ -95,9 +103,10 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
|
||||
|
||||
return CALL(q, iolock, q, vb, fbuf);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_iolock);
|
||||
|
||||
void *videobuf_queue_to_vmalloc (struct videobuf_queue *q,
|
||||
struct videobuf_buffer *buf)
|
||||
void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
|
||||
struct videobuf_buffer *buf)
|
||||
{
|
||||
if (q->int_ops->vmalloc)
|
||||
return q->int_ops->vmalloc(buf);
|
||||
@@ -146,6 +155,7 @@ void videobuf_queue_core_init(struct videobuf_queue *q,
|
||||
init_waitqueue_head(&q->wait);
|
||||
INIT_LIST_HEAD(&q->stream);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_core_init);
|
||||
|
||||
/* Locking: Only usage in bttv unsafe find way to remove */
|
||||
int videobuf_queue_is_busy(struct videobuf_queue *q)
|
||||
@@ -184,6 +194,7 @@ int videobuf_queue_is_busy(struct videobuf_queue *q)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_is_busy);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
void videobuf_queue_cancel(struct videobuf_queue *q)
|
||||
@@ -216,6 +227,7 @@ void videobuf_queue_cancel(struct videobuf_queue *q)
|
||||
}
|
||||
INIT_LIST_HEAD(&q->stream);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_cancel);
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
@@ -237,6 +249,7 @@ enum v4l2_field videobuf_next_field(struct videobuf_queue *q)
|
||||
}
|
||||
return field;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_next_field);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
|
||||
@@ -305,8 +318,7 @@ static int __videobuf_mmap_free(struct videobuf_queue *q)
|
||||
|
||||
MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
|
||||
|
||||
|
||||
rc = CALL(q, mmap_free, q);
|
||||
rc = CALL(q, mmap_free, q);
|
||||
|
||||
q->is_mmapped = 0;
|
||||
|
||||
@@ -332,6 +344,7 @@ int videobuf_mmap_free(struct videobuf_queue *q)
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_mmap_free);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
int __videobuf_mmap_setup(struct videobuf_queue *q,
|
||||
@@ -351,7 +364,7 @@ int __videobuf_mmap_setup(struct videobuf_queue *q,
|
||||
for (i = 0; i < bcount; i++) {
|
||||
q->bufs[i] = videobuf_alloc(q);
|
||||
|
||||
if (q->bufs[i] == NULL)
|
||||
if (NULL == q->bufs[i])
|
||||
break;
|
||||
|
||||
q->bufs[i]->i = i;
|
||||
@@ -372,11 +385,11 @@ int __videobuf_mmap_setup(struct videobuf_queue *q,
|
||||
if (!i)
|
||||
return -ENOMEM;
|
||||
|
||||
dprintk(1, "mmap setup: %d buffers, %d bytes each\n",
|
||||
i, bsize);
|
||||
dprintk(1, "mmap setup: %d buffers, %d bytes each\n", i, bsize);
|
||||
|
||||
return i;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(__videobuf_mmap_setup);
|
||||
|
||||
int videobuf_mmap_setup(struct videobuf_queue *q,
|
||||
unsigned int bcount, unsigned int bsize,
|
||||
@@ -388,6 +401,7 @@ int videobuf_mmap_setup(struct videobuf_queue *q,
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_mmap_setup);
|
||||
|
||||
int videobuf_reqbufs(struct videobuf_queue *q,
|
||||
struct v4l2_requestbuffers *req)
|
||||
@@ -432,7 +446,7 @@ int videobuf_reqbufs(struct videobuf_queue *q,
|
||||
q->ops->buf_setup(q, &count, &size);
|
||||
dprintk(1, "reqbufs: bufs=%d, size=0x%x [%u pages total]\n",
|
||||
count, size,
|
||||
(unsigned int)((count*PAGE_ALIGN(size))>>PAGE_SHIFT) );
|
||||
(unsigned int)((count * PAGE_ALIGN(size)) >> PAGE_SHIFT));
|
||||
|
||||
retval = __videobuf_mmap_setup(q, count, size, req->memory);
|
||||
if (retval < 0) {
|
||||
@@ -447,6 +461,7 @@ int videobuf_reqbufs(struct videobuf_queue *q,
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_reqbufs);
|
||||
|
||||
int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
|
||||
{
|
||||
@@ -473,9 +488,9 @@ done:
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_querybuf);
|
||||
|
||||
int videobuf_qbuf(struct videobuf_queue *q,
|
||||
struct v4l2_buffer *b)
|
||||
int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b)
|
||||
{
|
||||
struct videobuf_buffer *buf;
|
||||
enum v4l2_field field;
|
||||
@@ -571,7 +586,7 @@ int videobuf_qbuf(struct videobuf_queue *q,
|
||||
retval = 0;
|
||||
wake_up_interruptible_sync(&q->wait);
|
||||
|
||||
done:
|
||||
done:
|
||||
mutex_unlock(&q->vb_lock);
|
||||
|
||||
if (b->memory == V4L2_MEMORY_MMAP)
|
||||
@@ -579,7 +594,7 @@ int videobuf_qbuf(struct videobuf_queue *q,
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_qbuf);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
static int stream_next_buffer_check_queue(struct videobuf_queue *q, int noblock)
|
||||
@@ -624,7 +639,6 @@ done:
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
static int stream_next_buffer(struct videobuf_queue *q,
|
||||
struct videobuf_buffer **vb, int nonblocking)
|
||||
@@ -647,7 +661,7 @@ done:
|
||||
}
|
||||
|
||||
int videobuf_dqbuf(struct videobuf_queue *q,
|
||||
struct v4l2_buffer *b, int nonblocking)
|
||||
struct v4l2_buffer *b, int nonblocking)
|
||||
{
|
||||
struct videobuf_buffer *buf = NULL;
|
||||
int retval;
|
||||
@@ -682,11 +696,11 @@ int videobuf_dqbuf(struct videobuf_queue *q,
|
||||
list_del(&buf->stream);
|
||||
memset(b, 0, sizeof(*b));
|
||||
videobuf_status(q, b, buf, q->type);
|
||||
|
||||
done:
|
||||
done:
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_dqbuf);
|
||||
|
||||
int videobuf_streamon(struct videobuf_queue *q)
|
||||
{
|
||||
@@ -709,10 +723,11 @@ int videobuf_streamon(struct videobuf_queue *q)
|
||||
spin_unlock_irqrestore(q->irqlock, flags);
|
||||
|
||||
wake_up_interruptible_sync(&q->wait);
|
||||
done:
|
||||
done:
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_streamon);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
static int __videobuf_streamoff(struct videobuf_queue *q)
|
||||
@@ -735,6 +750,7 @@ int videobuf_streamoff(struct videobuf_queue *q)
|
||||
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_streamoff);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
static ssize_t videobuf_read_zerocopy(struct videobuf_queue *q,
|
||||
@@ -774,7 +790,7 @@ static ssize_t videobuf_read_zerocopy(struct videobuf_queue *q,
|
||||
retval = q->read_buf->size;
|
||||
}
|
||||
|
||||
done:
|
||||
done:
|
||||
/* cleanup */
|
||||
q->ops->buf_release(q, q->read_buf);
|
||||
kfree(q->read_buf);
|
||||
@@ -862,10 +878,11 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
|
||||
q->read_buf = NULL;
|
||||
}
|
||||
|
||||
done:
|
||||
done:
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_one);
|
||||
|
||||
/* Locking: Caller holds q->vb_lock */
|
||||
static int __videobuf_read_start(struct videobuf_queue *q)
|
||||
@@ -917,7 +934,6 @@ static void __videobuf_read_stop(struct videobuf_queue *q)
|
||||
q->bufs[i] = NULL;
|
||||
}
|
||||
q->read_buf = NULL;
|
||||
|
||||
}
|
||||
|
||||
int videobuf_read_start(struct videobuf_queue *q)
|
||||
@@ -930,6 +946,7 @@ int videobuf_read_start(struct videobuf_queue *q)
|
||||
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_start);
|
||||
|
||||
void videobuf_read_stop(struct videobuf_queue *q)
|
||||
{
|
||||
@@ -937,6 +954,7 @@ void videobuf_read_stop(struct videobuf_queue *q)
|
||||
__videobuf_read_stop(q);
|
||||
mutex_unlock(&q->vb_lock);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_stop);
|
||||
|
||||
void videobuf_stop(struct videobuf_queue *q)
|
||||
{
|
||||
@@ -950,7 +968,7 @@ void videobuf_stop(struct videobuf_queue *q)
|
||||
|
||||
mutex_unlock(&q->vb_lock);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_stop);
|
||||
|
||||
ssize_t videobuf_read_stream(struct videobuf_queue *q,
|
||||
char __user *data, size_t count, loff_t *ppos,
|
||||
@@ -1019,10 +1037,11 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
|
||||
break;
|
||||
}
|
||||
|
||||
done:
|
||||
done:
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_stream);
|
||||
|
||||
unsigned int videobuf_poll_stream(struct file *file,
|
||||
struct videobuf_queue *q,
|
||||
@@ -1062,9 +1081,9 @@ unsigned int videobuf_poll_stream(struct file *file,
|
||||
mutex_unlock(&q->vb_lock);
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_poll_stream);
|
||||
|
||||
int videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||
struct vm_area_struct *vma)
|
||||
int videobuf_mmap_mapper(struct videobuf_queue *q, struct vm_area_struct *vma)
|
||||
{
|
||||
int retval;
|
||||
|
||||
@@ -1077,6 +1096,7 @@ int videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_mmap_mapper);
|
||||
|
||||
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
||||
int videobuf_cgmbuf(struct videobuf_queue *q,
|
||||
@@ -1107,33 +1127,3 @@ int videobuf_cgmbuf(struct videobuf_queue *q,
|
||||
EXPORT_SYMBOL_GPL(videobuf_cgmbuf);
|
||||
#endif
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_waiton);
|
||||
EXPORT_SYMBOL_GPL(videobuf_iolock);
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_alloc);
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_core_init);
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_cancel);
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_is_busy);
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_next_field);
|
||||
EXPORT_SYMBOL_GPL(videobuf_reqbufs);
|
||||
EXPORT_SYMBOL_GPL(videobuf_querybuf);
|
||||
EXPORT_SYMBOL_GPL(videobuf_qbuf);
|
||||
EXPORT_SYMBOL_GPL(videobuf_dqbuf);
|
||||
EXPORT_SYMBOL_GPL(videobuf_streamon);
|
||||
EXPORT_SYMBOL_GPL(videobuf_streamoff);
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_start);
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_stop);
|
||||
EXPORT_SYMBOL_GPL(videobuf_stop);
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_stream);
|
||||
EXPORT_SYMBOL_GPL(videobuf_read_one);
|
||||
EXPORT_SYMBOL_GPL(videobuf_poll_stream);
|
||||
|
||||
EXPORT_SYMBOL_GPL(__videobuf_mmap_setup);
|
||||
EXPORT_SYMBOL_GPL(videobuf_mmap_setup);
|
||||
EXPORT_SYMBOL_GPL(videobuf_mmap_free);
|
||||
EXPORT_SYMBOL_GPL(videobuf_mmap_mapper);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -30,8 +30,12 @@
|
||||
#define MAGIC_DMABUF 0x17760309
|
||||
#define MAGIC_VMAL_MEM 0x18221223
|
||||
|
||||
#define MAGIC_CHECK(is,should) if (unlikely((is) != (should))) \
|
||||
{ printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); }
|
||||
#define MAGIC_CHECK(is, should) \
|
||||
if (unlikely((is) != (should))) { \
|
||||
printk(KERN_ERR "magic mismatch: %x (expected %x)\n", \
|
||||
is, should); \
|
||||
BUG(); \
|
||||
}
|
||||
|
||||
static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
@@ -40,19 +44,19 @@ MODULE_DESCRIPTION("helper module to manage video4linux vmalloc buffers");
|
||||
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#define dprintk(level, fmt, arg...) if (debug >= level) \
|
||||
printk(KERN_DEBUG "vbuf-vmalloc: " fmt , ## arg)
|
||||
#define dprintk(level, fmt, arg...) \
|
||||
if (debug >= level) \
|
||||
printk(KERN_DEBUG "vbuf-vmalloc: " fmt , ## arg)
|
||||
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
static void
|
||||
videobuf_vm_open(struct vm_area_struct *vma)
|
||||
static void videobuf_vm_open(struct vm_area_struct *vma)
|
||||
{
|
||||
struct videobuf_mapping *map = vma->vm_private_data;
|
||||
|
||||
dprintk(2,"vm_open %p [count=%u,vma=%08lx-%08lx]\n",map,
|
||||
map->count,vma->vm_start,vma->vm_end);
|
||||
dprintk(2, "vm_open %p [count=%u,vma=%08lx-%08lx]\n", map,
|
||||
map->count, vma->vm_start, vma->vm_end);
|
||||
|
||||
map->count++;
|
||||
}
|
||||
@@ -63,7 +67,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma)
|
||||
struct videobuf_queue *q = map->q;
|
||||
int i;
|
||||
|
||||
dprintk(2,"vm_close %p [count=%u,vma=%08lx-%08lx]\n", map,
|
||||
dprintk(2, "vm_close %p [count=%u,vma=%08lx-%08lx]\n", map,
|
||||
map->count, vma->vm_start, vma->vm_end);
|
||||
|
||||
map->count--;
|
||||
@@ -116,8 +120,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma)
|
||||
return;
|
||||
}
|
||||
|
||||
static const struct vm_operations_struct videobuf_vm_ops =
|
||||
{
|
||||
static const struct vm_operations_struct videobuf_vm_ops = {
|
||||
.open = videobuf_vm_open,
|
||||
.close = videobuf_vm_close,
|
||||
};
|
||||
@@ -137,23 +140,23 @@ static void *__videobuf_alloc(size_t size)
|
||||
struct videobuf_vmalloc_memory *mem;
|
||||
struct videobuf_buffer *vb;
|
||||
|
||||
vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
|
||||
vb = kzalloc(size + sizeof(*mem), GFP_KERNEL);
|
||||
if (!vb)
|
||||
return vb;
|
||||
|
||||
mem = vb->priv = ((char *)vb)+size;
|
||||
mem->magic=MAGIC_VMAL_MEM;
|
||||
mem = vb->priv = ((char *)vb) + size;
|
||||
mem->magic = MAGIC_VMAL_MEM;
|
||||
|
||||
dprintk(1,"%s: allocated at %p(%ld+%ld) & %p(%ld)\n",
|
||||
__func__,vb,(long)sizeof(*vb),(long)size-sizeof(*vb),
|
||||
mem,(long)sizeof(*mem));
|
||||
dprintk(1, "%s: allocated at %p(%ld+%ld) & %p(%ld)\n",
|
||||
__func__, vb, (long)sizeof(*vb), (long)size - sizeof(*vb),
|
||||
mem, (long)sizeof(*mem));
|
||||
|
||||
return vb;
|
||||
}
|
||||
|
||||
static int __videobuf_iolock (struct videobuf_queue* q,
|
||||
struct videobuf_buffer *vb,
|
||||
struct v4l2_framebuffer *fbuf)
|
||||
static int __videobuf_iolock(struct videobuf_queue *q,
|
||||
struct videobuf_buffer *vb,
|
||||
struct v4l2_framebuffer *fbuf)
|
||||
{
|
||||
struct videobuf_vmalloc_memory *mem = vb->priv;
|
||||
int pages;
|
||||
@@ -177,15 +180,13 @@ static int __videobuf_iolock (struct videobuf_queue* q,
|
||||
|
||||
dprintk(1, "%s memory method USERPTR\n", __func__);
|
||||
|
||||
#if 1
|
||||
if (vb->baddr) {
|
||||
printk(KERN_ERR "USERPTR is currently not supported\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* The only USERPTR currently supported is the one needed for
|
||||
read() method.
|
||||
* read() method.
|
||||
*/
|
||||
|
||||
mem->vmalloc = vmalloc_user(pages);
|
||||
@@ -210,7 +211,7 @@ static int __videobuf_iolock (struct videobuf_queue* q,
|
||||
/* Try to remap memory */
|
||||
rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0);
|
||||
if (rc < 0) {
|
||||
printk(KERN_ERR "mmap: remap failed with error %d. ", rc);
|
||||
printk(KERN_ERR "mmap: remap failed with error %d", rc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
#endif
|
||||
@@ -273,7 +274,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||
break;
|
||||
}
|
||||
if (VIDEO_MAX_FRAME == first) {
|
||||
dprintk(1,"mmap app bug: offset invalid [offset=0x%lx]\n",
|
||||
dprintk(1, "mmap app bug: offset invalid [offset=0x%lx]\n",
|
||||
(vma->vm_pgoff << PAGE_SHIFT));
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -300,8 +301,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||
printk(KERN_ERR "vmalloc (%d pages) failed\n", pages);
|
||||
goto error;
|
||||
}
|
||||
dprintk(1, "vmalloc is at addr %p (%d pages)\n",
|
||||
mem->vmalloc, pages);
|
||||
dprintk(1, "vmalloc is at addr %p (%d pages)\n", mem->vmalloc, pages);
|
||||
|
||||
/* Try to remap memory */
|
||||
retval = remap_vmalloc_range(vma, mem->vmalloc, 0);
|
||||
@@ -315,7 +315,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||
vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
|
||||
vma->vm_private_data = map;
|
||||
|
||||
dprintk(1,"mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n",
|
||||
dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n",
|
||||
map, q, vma->vm_start, vma->vm_end,
|
||||
(long int) q->bufs[first]->bsize,
|
||||
vma->vm_pgoff, first);
|
||||
@@ -330,15 +330,15 @@ error:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int __videobuf_copy_to_user ( struct videobuf_queue *q,
|
||||
char __user *data, size_t count,
|
||||
int nonblocking )
|
||||
static int __videobuf_copy_to_user(struct videobuf_queue *q,
|
||||
char __user *data, size_t count,
|
||||
int nonblocking)
|
||||
{
|
||||
struct videobuf_vmalloc_memory *mem=q->read_buf->priv;
|
||||
BUG_ON (!mem);
|
||||
MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
|
||||
struct videobuf_vmalloc_memory *mem = q->read_buf->priv;
|
||||
BUG_ON(!mem);
|
||||
MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
|
||||
|
||||
BUG_ON (!mem->vmalloc);
|
||||
BUG_ON(!mem->vmalloc);
|
||||
|
||||
/* copy to userspace */
|
||||
if (count > q->read_buf->size - q->read_off)
|
||||
@@ -350,30 +350,30 @@ static int __videobuf_copy_to_user ( struct videobuf_queue *q,
|
||||
return count;
|
||||
}
|
||||
|
||||
static int __videobuf_copy_stream ( struct videobuf_queue *q,
|
||||
char __user *data, size_t count, size_t pos,
|
||||
int vbihack, int nonblocking )
|
||||
static int __videobuf_copy_stream(struct videobuf_queue *q,
|
||||
char __user *data, size_t count, size_t pos,
|
||||
int vbihack, int nonblocking)
|
||||
{
|
||||
unsigned int *fc;
|
||||
struct videobuf_vmalloc_memory *mem=q->read_buf->priv;
|
||||
BUG_ON (!mem);
|
||||
MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
|
||||
unsigned int *fc;
|
||||
struct videobuf_vmalloc_memory *mem = q->read_buf->priv;
|
||||
BUG_ON(!mem);
|
||||
MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
|
||||
|
||||
if (vbihack) {
|
||||
/* dirty, undocumented hack -- pass the frame counter
|
||||
* within the last four bytes of each vbi data block.
|
||||
* We need that one to maintain backward compatibility
|
||||
* to all vbi decoding software out there ... */
|
||||
fc = (unsigned int*)mem->vmalloc;
|
||||
fc += (q->read_buf->size>>2) -1;
|
||||
fc = (unsigned int *)mem->vmalloc;
|
||||
fc += (q->read_buf->size >> 2) - 1;
|
||||
*fc = q->read_buf->field_count >> 1;
|
||||
dprintk(1,"vbihack: %d\n",*fc);
|
||||
dprintk(1, "vbihack: %d\n", *fc);
|
||||
}
|
||||
|
||||
/* copy stuff using the common method */
|
||||
count = __videobuf_copy_to_user (q,data,count,nonblocking);
|
||||
count = __videobuf_copy_to_user(q, data, count, nonblocking);
|
||||
|
||||
if ( (count==-EFAULT) && (0 == pos) )
|
||||
if ((count == -EFAULT) && (0 == pos))
|
||||
return -EFAULT;
|
||||
|
||||
return count;
|
||||
@@ -392,7 +392,7 @@ static struct videobuf_qtype_ops qops = {
|
||||
.vmalloc = videobuf_to_vmalloc,
|
||||
};
|
||||
|
||||
void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
|
||||
void videobuf_queue_vmalloc_init(struct videobuf_queue *q,
|
||||
const struct videobuf_queue_ops *ops,
|
||||
struct device *dev,
|
||||
spinlock_t *irqlock,
|
||||
@@ -404,20 +404,19 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
|
||||
videobuf_queue_core_init(q, ops, dev, irqlock, type, field, msize,
|
||||
priv, &qops);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(videobuf_queue_vmalloc_init);
|
||||
|
||||
void *videobuf_to_vmalloc (struct videobuf_buffer *buf)
|
||||
void *videobuf_to_vmalloc(struct videobuf_buffer *buf)
|
||||
{
|
||||
struct videobuf_vmalloc_memory *mem=buf->priv;
|
||||
BUG_ON (!mem);
|
||||
MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
|
||||
struct videobuf_vmalloc_memory *mem = buf->priv;
|
||||
BUG_ON(!mem);
|
||||
MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
|
||||
|
||||
return mem->vmalloc;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_to_vmalloc);
|
||||
|
||||
void videobuf_vmalloc_free (struct videobuf_buffer *buf)
|
||||
void videobuf_vmalloc_free(struct videobuf_buffer *buf)
|
||||
{
|
||||
struct videobuf_vmalloc_memory *mem = buf->priv;
|
||||
|
||||
@@ -442,8 +441,3 @@ void videobuf_vmalloc_free (struct videobuf_buffer *buf)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(videobuf_vmalloc_free);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
||||
@@ -129,14 +129,14 @@ struct videobuf_qtype_ops {
|
||||
|
||||
void *(*alloc) (size_t size);
|
||||
void *(*vmalloc) (struct videobuf_buffer *buf);
|
||||
int (*iolock) (struct videobuf_queue* q,
|
||||
int (*iolock) (struct videobuf_queue *q,
|
||||
struct videobuf_buffer *vb,
|
||||
struct v4l2_framebuffer *fbuf);
|
||||
int (*mmap) (struct videobuf_queue *q,
|
||||
unsigned int *count,
|
||||
unsigned int *size,
|
||||
enum v4l2_memory memory);
|
||||
int (*sync) (struct videobuf_queue* q,
|
||||
int (*sync) (struct videobuf_queue *q,
|
||||
struct videobuf_buffer *buf);
|
||||
int (*video_copy_to_user)(struct videobuf_queue *q,
|
||||
char __user *data,
|
||||
@@ -185,14 +185,14 @@ struct videobuf_queue {
|
||||
};
|
||||
|
||||
int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
|
||||
int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
|
||||
int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
|
||||
struct v4l2_framebuffer *fbuf);
|
||||
|
||||
void *videobuf_alloc(struct videobuf_queue* q);
|
||||
|
||||
/* Used on videobuf-dvb */
|
||||
void *videobuf_queue_to_vmalloc (struct videobuf_queue* q,
|
||||
struct videobuf_buffer *buf);
|
||||
void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
|
||||
struct videobuf_buffer *buf);
|
||||
|
||||
void videobuf_queue_core_init(struct videobuf_queue *q,
|
||||
const struct videobuf_queue_ops *ops,
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2
|
||||
*/
|
||||
#ifndef _VIDEOBUF_DMA_SG_H
|
||||
#define _VIDEOBUF_DMA_SG_H
|
||||
|
||||
#include <media/videobuf-core.h>
|
||||
|
||||
@@ -27,14 +29,14 @@
|
||||
* block (NULL on errors). Memory for the scatterlist is allocated
|
||||
* using kmalloc. The caller must free the memory.
|
||||
*/
|
||||
struct scatterlist* videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages);
|
||||
struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages);
|
||||
|
||||
/*
|
||||
* Return a scatterlist for a an array of userpages (NULL on errors).
|
||||
* Memory for the scatterlist is allocated using kmalloc. The caller
|
||||
* must free the memory.
|
||||
*/
|
||||
struct scatterlist* videobuf_pages_to_sg(struct page **pages, int nr_pages,
|
||||
struct scatterlist *videobuf_pages_to_sg(struct page **pages, int nr_pages,
|
||||
int offset);
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
@@ -78,8 +80,7 @@ struct videobuf_dmabuf {
|
||||
int direction;
|
||||
};
|
||||
|
||||
struct videobuf_dma_sg_memory
|
||||
{
|
||||
struct videobuf_dma_sg_memory {
|
||||
u32 magic;
|
||||
|
||||
/* for mmap'ed buffers */
|
||||
@@ -95,14 +96,14 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction,
|
||||
dma_addr_t addr, int nr_pages);
|
||||
int videobuf_dma_free(struct videobuf_dmabuf *dma);
|
||||
|
||||
int videobuf_dma_map(struct videobuf_queue* q,struct videobuf_dmabuf *dma);
|
||||
int videobuf_dma_sync(struct videobuf_queue* q,struct videobuf_dmabuf *dma);
|
||||
int videobuf_dma_unmap(struct videobuf_queue* q,struct videobuf_dmabuf *dma);
|
||||
struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf);
|
||||
int videobuf_dma_map(struct videobuf_queue *q, struct videobuf_dmabuf *dma);
|
||||
int videobuf_dma_sync(struct videobuf_queue *q, struct videobuf_dmabuf *dma);
|
||||
int videobuf_dma_unmap(struct videobuf_queue *q, struct videobuf_dmabuf *dma);
|
||||
struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf);
|
||||
|
||||
void *videobuf_sg_alloc(size_t size);
|
||||
|
||||
void videobuf_queue_sg_init(struct videobuf_queue* q,
|
||||
void videobuf_queue_sg_init(struct videobuf_queue *q,
|
||||
const struct videobuf_queue_ops *ops,
|
||||
struct device *dev,
|
||||
spinlock_t *irqlock,
|
||||
@@ -111,9 +112,11 @@ void videobuf_queue_sg_init(struct videobuf_queue* q,
|
||||
unsigned int msize,
|
||||
void *priv);
|
||||
|
||||
/*FIXME: these variants are used only on *-alsa code, where videobuf is
|
||||
* used without queue
|
||||
*/
|
||||
/*FIXME: these variants are used only on *-alsa code, where videobuf is
|
||||
* used without queue
|
||||
*/
|
||||
int videobuf_sg_dma_map(struct device *dev, struct videobuf_dmabuf *dma);
|
||||
int videobuf_sg_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma);
|
||||
|
||||
#endif /* _VIDEOBUF_DMA_SG_H */
|
||||
|
||||
|
||||
@@ -19,17 +19,17 @@
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
struct videobuf_vmalloc_memory
|
||||
{
|
||||
struct videobuf_vmalloc_memory {
|
||||
u32 magic;
|
||||
|
||||
void *vmalloc;
|
||||
|
||||
/* remap_vmalloc_range seems to need to run after mmap() on some cases */
|
||||
/* remap_vmalloc_range seems to need to run
|
||||
* after mmap() on some cases */
|
||||
struct vm_area_struct *vma;
|
||||
};
|
||||
|
||||
void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
|
||||
void videobuf_queue_vmalloc_init(struct videobuf_queue *q,
|
||||
const struct videobuf_queue_ops *ops,
|
||||
struct device *dev,
|
||||
spinlock_t *irqlock,
|
||||
@@ -38,8 +38,8 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
|
||||
unsigned int msize,
|
||||
void *priv);
|
||||
|
||||
void *videobuf_to_vmalloc (struct videobuf_buffer *buf);
|
||||
void *videobuf_to_vmalloc(struct videobuf_buffer *buf);
|
||||
|
||||
void videobuf_vmalloc_free (struct videobuf_buffer *buf);
|
||||
void videobuf_vmalloc_free(struct videobuf_buffer *buf);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user