V4L2-library October 2007

v4l2-library@linuxtv.org

2 participants
11 discussions

[PATCH 1/2] V4L: v4l2_extension: fix ext device name
by Jiri Slaby 11 Oct '07

11 Oct '07

# HG changeset patch # User Jiri Slaby <jirislaby(a)gmail.com> # Date 1192096703 -7200 # Node ID 4fbd75ec9acee9dc29de45491c6f3cee58b07076 # Parent 1f0b37d344c430ef09788f0193ada0ee08062447 v4l2_extension: fix ext device name update card name, not driver name, since it is, what is seen in the device list Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> diff -r 1f0b37d344c4 -r 4fbd75ec9ace linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c Thu Oct 11 12:01:10 2007 +0200 +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c Thu Oct 11 11:58:23 2007 +0200 @@ -151,7 +151,7 @@ static int vidioc_querycap(struct file * ret = base_dev->vidioc_querycap(&dev->fake_file, dev->fake_file.private_data, vc); - strlcpy(vc->driver, dev->vdev->name, sizeof(vc->driver)); + strlcpy(vc->card, dev->vdev->name, sizeof(vc->card)); } return ret; }

2 2

[PATCH 1/3] V4L: v4l2_extension: checkpatch fixups
by Jiri Slaby 07 Oct '07

07 Oct '07

# HG changeset patch # User Jiri Slaby <jirislaby(a)gmail.com> # Date 1191758673 -7200 # Node ID 14896a4d8f5d21d20b84dfd0a147c5a326f34599 # Parent 86d96d9bea4a26de43c0b7997cd751b49fe5ba0b v4l2_extension: checkpatch fixups yet another cleanups how checkpatch offers them Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c @@ -78,7 +78,7 @@ static int v4l2ext_hlp_open(struct inode /* allocate and initialize device private data structure */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (dev == NULL) { - printk("cannot allocate device.\n"); + printk(KERN_ERR "cannot allocate device.\n"); return -ENOMEM; } @@ -88,7 +88,8 @@ static int v4l2ext_hlp_open(struct inode return 0; } -static int v4l2ext_hlp_release(struct inode *inode, struct file *file) { +static int v4l2ext_hlp_release(struct inode *inode, struct file *file) +{ mutex_lock(&helper_daemon_lock); /* Helper daemon has gone */ @@ -100,8 +101,7 @@ static int v4l2ext_hlp_release(struct in return 0; } -static const struct file_operations v4l2ext_hlp_fops= -{ +static const struct file_operations v4l2ext_hlp_fops = { .owner = THIS_MODULE, .open = v4l2ext_hlp_open, .poll = v4l2ext_hlp_poll, @@ -142,7 +142,8 @@ err: return ret; } -void v4l2ext_hlp_fini(void) { +void v4l2ext_hlp_fini(void) +{ class_device_destroy(helper_class, MKDEV(helper_major, 0)); unregister_chrdev(helper_major, HELPER_IF_NAME); class_destroy(helper_class); diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c @@ -37,9 +37,9 @@ MODULE_LICENSE("GPL"); static unsigned int video_debug; module_param(video_debug, int, 0644); -MODULE_PARM_DESC(video_debug,"enable debug messages [video]"); - -#define dprintk(level,fmt, arg...) do { \ +MODULE_PARM_DESC(video_debug, "enable debug messages [video]"); + +#define dprintk(level, fmt, arg...) do { \ if (video_debug >= level) \ printk(KERN_DEBUG "v4l2_extension: " fmt, ## arg); \ } while (0) @@ -107,7 +107,7 @@ video_poll(struct file *file, struct pol struct video_device *base_dev = dev->base_vdev; if (base_dev->fops->poll) - return base_dev->fops->poll(&dev->fake_file,wait); + return base_dev->fops->poll(&dev->fake_file, wait); else return -EINVAL; } diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension.h b/linux/drivers/media/video/v4l2_extension/v4l2_extension.h --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension.h +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension.h @@ -30,7 +30,7 @@ #include <linux/version.h> #include <linux/mutex.h> -#define V4L2EXT_VERSION_CODE KERNEL_VERSION(0,0,1) +#define V4L2EXT_VERSION_CODE KERNEL_VERSION(0, 0, 1) /***************************************************************************/ /* v4l2 extension driver public interface */

2 4

Re: [V4l2-library] [PATCH 8/8] V4L: v4l2_extension: check for v4l2ext_hlp_init retval in v4l2ext_init
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191678256 -7200 > # Node ID 86d96d9bea4a26de43c0b7997cd751b49fe5ba0b > # Parent a4e8124c6f90a766a49b2e042a757b31faeed8ee > v4l2_extension: check for v4l2ext_hlp_init retval in v4l2ext_init > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > @@ -535,9 +535,7 @@ static int v4l2ext_init(void) > V4L2EXT_VERSION_CODE & 0xff); > > /* activate the v4l2 helper daemon interface */ > - v4l2ext_hlp_init(); > - > - return 0; > + return v4l2ext_hlp_init(); > } > > static void v4l2ext_fini(void) > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thanks for this patch series, the code looks and behaves better. Thierry

1 0

Re: [V4l2-library] [PATCH 7/8] V4L: v4l2_extension: use list_for_each_entry istead of list_for_each
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191677598 -7200 > # Node ID a4e8124c6f90a766a49b2e042a757b31faeed8ee > # Parent f89a5dbbfcf7706106d46d0702659e84db9f33df > v4l2_extension: use list_for_each_entry istead of list_for_each > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > @@ -60,18 +60,16 @@ static int video_open(struct inode *inod > static int video_open(struct inode *inode, struct file *file) > { > int minor = iminor(inode); > - struct v4l2ext *h; > - struct v4l2ext *dev = NULL; > - struct list_head *list; > + struct v4l2ext *h, *dev = NULL; > struct video_device *base_dev; > > /* Find the right private data corresponding to this inode */ > - list_for_each(list,&v4l2ext_devlist) { > - h = list_entry(list, struct v4l2ext, devlist); > + list_for_each_entry(h, &v4l2ext_devlist, devlist) > if (h->vdev->minor == minor) { > dev = h; > + break; > } > - } > + > if (dev == NULL) > return -ENODEV; > > @@ -545,16 +543,14 @@ static void v4l2ext_fini(void) > static void v4l2ext_fini(void) > { > struct v4l2ext *h; > - struct list_head *list; > > /* remove the v4l2 helper daemon interface */ > v4l2ext_hlp_fini(); > > /* remove any registered base v4l structure */ > - list_for_each(list, &v4l2ext_devlist) { > - h = list_entry(list, struct v4l2ext, devlist); > + list_for_each_entry(h, &v4l2ext_devlist, devlist) > v4l2ext_unregister(h->base_vdev); > - } > + > printk(KERN_INFO "v4l2 extension module removed\n"); > } > > @@ -671,19 +667,17 @@ out: > /* and the corresponding 'clone' device entry point */ > void v4l2ext_unregister(struct video_device *base_vdev) > { > - struct v4l2ext *h; > - struct v4l2ext *dev = NULL; > - struct list_head *list; > + struct v4l2ext *h, *dev = NULL; > > mutex_lock(&v4l2ext_lock); > > /* find the corresponding entry in device list */ > - list_for_each(list,&v4l2ext_devlist) { > - h = list_entry(list, struct v4l2ext, devlist); > + list_for_each_entry(h, &v4l2ext_devlist, devlist) { > /* FIXME: The way to match the corresponding entry is not > optimized and uncertain */ > if (h->base_vdev->fops == base_vdev->fops) { > - dev = h; > + dev = h; > + break; > } > } > if (dev != NULL) { > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

Re: [V4l2-library] [PATCH 6/8] V4L: v4l2_extension: aiee, don't deref NULL on fail path in v4l2ext_register
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191677283 -7200 > # Node ID f89a5dbbfcf7706106d46d0702659e84db9f33df > # Parent 210b62fbf40aba1dc223da3c47c2db4650dc0ac6 > v4l2_extension: aiee, don't deref NULL on fail path in v4l2ext_register > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > @@ -657,11 +657,12 @@ int v4l2ext_register(struct video_device > /* Error case, cleanup what must be cleaned */ > out_free: > v4l2ext_devused &= ~(1 << nr); > - if (dev) > + if (dev) { > video_device_release(dev->vdev); > + kfree(dev->fake_file.f_dentry); > + } > + kfree(fake_inode); > kfree(dev); > - kfree(fake_inode); > - kfree(dev->fake_file.f_dentry); > out: > return ret; > } > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

Re: [V4l2-library] [PATCH 5/8] V4L: v4l2_extension: proper v4l2ext_lock locking in v4l2ext_register
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191675980 -7200 > # Node ID 210b62fbf40aba1dc223da3c47c2db4650dc0ac6 > # Parent a39992015edfc30818c224d1886dc8311bc3106b > v4l2_extension: proper v4l2ext_lock locking in v4l2ext_register > > don't allow two releases of the lock on fail path > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > @@ -575,7 +575,8 @@ int v4l2ext_register(struct video_device > printk(KERN_ERR "This driver supports only %d device " > "creations\n", V4L2EXT_MAXDEV); > ret = -ENOSPC; > - goto out_unlock; > + mutex_unlock(&v4l2ext_lock); > + goto out; > } > > /* reserve this entry */ > @@ -661,10 +662,7 @@ int v4l2ext_register(struct video_device > kfree(dev); > kfree(fake_inode); > kfree(dev->fake_file.f_dentry); > - > - out_unlock: > - mutex_unlock(&v4l2ext_lock); > - > +out: > return ret; > } > > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

Re: [V4l2-library] [PATCH 4/8] V4L: v4l2_extension: hlp_init/exit cleanup
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191675459 -7200 > # Node ID a39992015edfc30818c224d1886dc8311bc3106b > # Parent d1d8e50056430b80d13f729e4a87dfb5ffee58dc > v4l2_extension: hlp_init/exit cleanup > > use helper_major, not major 0 (as it is not 0), check for proper error value > returned by class_create (it doesn't return NULL, but ERR_PTR encoded retval). > also propagate the retval one layer upper. > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > @@ -112,17 +112,23 @@ static const struct file_operations v4l2 > > int v4l2ext_hlp_init(void) > { > + int ret; > + > /* Unnamed device creation */ > - helper_major = register_chrdev(0, HELPER_IF_NAME, &v4l2ext_hlp_fops); > - if (helper_major < 0) { > - printk(KERN_WARNING "v4l2_extension: unable to get major\n"); > - return -EIO; > + ret = register_chrdev(0, HELPER_IF_NAME, &v4l2ext_hlp_fops); > + if (ret < 0) { > + printk(KERN_ERR "v4l2_extension: unable to get major\n"); > + goto err; > } > + helper_major = ret; > > /* create a driver class in order to automate udev */ > helper_class = class_create(THIS_MODULE, HELPER_IF_NAME); > - if (!helper_class) > - return -EINVAL; > + if (IS_ERR(helper_class)) { > + printk(KERN_ERR "v4l2_extension: unable to create a class\n"); > + ret = PTR_ERR(helper_class); > + goto err_unr; > + } > > class_device_create(helper_class, > NULL, > @@ -130,11 +136,15 @@ int v4l2ext_hlp_init(void) > NULL, HELPER_IF_NAME); > > return 0; > +err_unr: > + unregister_chrdev(helper_major, HELPER_IF_NAME); > +err: > + return ret; > } > > void v4l2ext_hlp_fini(void) { > class_device_destroy(helper_class, MKDEV(helper_major, 0)); > - unregister_chrdev(0, HELPER_IF_NAME); > + unregister_chrdev(helper_major, HELPER_IF_NAME); > class_destroy(helper_class); > } > /* ----------------------------------------------------------- */ > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

Re: [V4l2-library] [PATCH 3/8] V4L: v4l2_extension: call nonseekable_open() for helper open
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191675239 -7200 > # Node ID d1d8e50056430b80d13f729e4a87dfb5ffee58dc > # Parent 9a1cfea77fed371494e8d3f7325f3f51a1c795f5 > v4l2_extension: call nonseekable_open() for helper open > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > @@ -73,6 +73,8 @@ static int v4l2ext_hlp_open(struct inode > helper_daemon = 1; > mutex_unlock(&helper_daemon_lock); > > + nonseekable_open(inode, file); > + > /* allocate and initialize device private data structure */ > dev = kzalloc(sizeof(*dev), GFP_KERNEL); > if (dev == NULL) { > @@ -101,7 +103,6 @@ static const struct file_operations v4l2 > static const struct file_operations v4l2ext_hlp_fops= > { > .owner = THIS_MODULE, > - .llseek = no_llseek, > .open = v4l2ext_hlp_open, > .poll = v4l2ext_hlp_poll, > .release = v4l2ext_hlp_release, > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

Re: [V4l2-library] [PATCH 2/8] V4L: v4l2_extension: fix helper daemon open/release locking
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191671579 -7200 > # Node ID 9a1cfea77fed371494e8d3f7325f3f51a1c795f5 > # Parent 3d81ec3f07e5b08a85add9e2319d7d5a2ba2895d > v4l2_extension: fix helper daemon open/release locking > > if (helper_daemon == 1) was racy, put it in critical section > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > @@ -25,7 +25,7 @@ > > /* helper_daemon states if the helper daemon has opened the driver */ > static unsigned int helper_daemon; > -static struct mutex helper_daemon_lock; > +static DEFINE_MUTEX(helper_daemon_lock); > > /* device management stuff */ > static struct class *helper_class; > @@ -62,14 +62,17 @@ static int v4l2ext_hlp_open(struct inode > { > struct helperd *dev; > > + if (mutex_lock_interruptible(&helper_daemon_lock)) > + return -ERESTARTSYS; > if (helper_daemon == 1) { > + mutex_unlock(&helper_daemon_lock); > return -EBUSY; > - } else { > - mutex_lock(&helper_daemon_lock); > - /* Helper daemon is here */ > - helper_daemon = 1; > - mutex_unlock(&helper_daemon_lock); > } > + > + /* Helper daemon is here */ > + helper_daemon = 1; > + mutex_unlock(&helper_daemon_lock); > + > /* allocate and initialize device private data structure */ > dev = kzalloc(sizeof(*dev), GFP_KERNEL); > if (dev == NULL) { > @@ -125,8 +128,6 @@ int v4l2ext_hlp_init(void) > MKDEV(helper_major, 0), > NULL, HELPER_IF_NAME); > > - mutex_init(&helper_daemon_lock); > - > return 0; > } > > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

Re: [V4l2-library] [PATCH 1/8] V4L: v4l2_extension: codingstyle approaching
by Thierry Merle 07 Oct '07

07 Oct '07

Jiri Slaby wrote: > # HG changeset patch > # User Jiri Slaby <jirislaby(a)gmail.com> > # Date 1191670121 -7200 > # Node ID 3d81ec3f07e5b08a85add9e2319d7d5a2ba2895d > # Parent 96e25bd5d144be49618335ae7130c8cde0230bf9 > v4l2_extension: codingstyle approaching > > this patch shouldn't contain any functional changes. only changes in > whitespace, printk's loglevel, some optimisations (NULL == x to x == NULL), > cast from/to void * removal, superfluous parenthesis removal etc. > > Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-core.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-core.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-core.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-core.c > @@ -1,6 +1,4 @@ > /* > - * > - * > * v4l2 extension module - extends some video device drivers > * coreutils part > * > @@ -24,12 +22,14 @@ > #include "v4l2_extension.h" > > /* ------------------------------------------------------------------ */ > -#define dprintk(level,fmt, arg...) if (core_debug >= level) \ > - printk(KERN_DEBUG "%s/0: " fmt, core->name , ## arg) > +#define dprintk(level, fmt, arg...) do { \ > + if (core_debug >= level) \ > + printk(KERN_DEBUG "%s/0: " fmt, core->name, ## arg); \ > +} while (0) > > -static unsigned int core_debug = 0; > -module_param(core_debug,int,0644); > -MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); > +static unsigned int core_debug; > +module_param(core_debug, int, 0644); > +MODULE_PARM_DESC(core_debug, "enable debug messages [core]"); > > /* > * Local variables: > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c > @@ -1,6 +1,4 @@ > /* > - * > - * > * v4l2 extension module - extends some video device drivers > * helper daemon interface part > * > @@ -26,7 +24,7 @@ > #define HELPER_IF_NAME "v4l2_extension" > > /* helper_daemon states if the helper daemon has opened the driver */ > -static int helper_daemon=0; > +static unsigned int helper_daemon; > static struct mutex helper_daemon_lock; > > /* device management stuff */ > @@ -38,9 +36,9 @@ static int helper_major; > * Helper daemon interface operations > */ > > - > int v4l2ext_hlp_ioctl(struct inode *inode, struct file *file, > - unsigned int cmd, unsigned long arg) { > + unsigned int cmd, unsigned long arg) > +{ > return 0; > } > > @@ -54,32 +52,33 @@ static unsigned int v4l2ext_hlp_poll(str > static unsigned int v4l2ext_hlp_poll(struct file *file, poll_table *wait) > { > struct helperd *dev = file->private_data; > + > poll_wait(file, &dev->waitqueue, wait); > + > return POLLIN | POLLRDNORM; > } > > -static int v4l2ext_hlp_open(struct inode *inode, struct file *file) { > - struct helperd *dev = NULL; > +static int v4l2ext_hlp_open(struct inode *inode, struct file *file) > +{ > + struct helperd *dev; > > - if(helper_daemon==1) { > + if (helper_daemon == 1) { > return -EBUSY; > - } > - else { > + } else { > mutex_lock(&helper_daemon_lock); > /* Helper daemon is here */ > helper_daemon = 1; > mutex_unlock(&helper_daemon_lock); > } > /* allocate and initialize device private data structure */ > - dev = kzalloc(sizeof(*dev),GFP_KERNEL); > - if (NULL == dev) { > + dev = kzalloc(sizeof(*dev), GFP_KERNEL); > + if (dev == NULL) { > printk("cannot allocate device.\n"); > return -ENOMEM; > } > > init_waitqueue_head(&dev->waitqueue); > file->private_data = dev; > - return 0; > > return 0; > } > @@ -107,12 +106,12 @@ static const struct file_operations v4l2 > .ioctl = v4l2ext_hlp_ioctl > }; > > -int v4l2ext_hlp_init(void) { > - > +int v4l2ext_hlp_init(void) > +{ > /* Unnamed device creation */ > helper_major = register_chrdev(0, HELPER_IF_NAME, &v4l2ext_hlp_fops); > - if(helper_major<0) { > - printk(KERN_WARNING "v4l2_extension: unable to get major 0\n"); > + if (helper_major < 0) { > + printk(KERN_WARNING "v4l2_extension: unable to get major\n"); > return -EIO; > } > > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c > @@ -1,6 +1,4 @@ > /* > - * > - * > * v4l2 extension module - extends some video device drivers > * v4l ioctl handling part > * > @@ -37,21 +35,23 @@ MODULE_LICENSE("GPL"); > > /* ------------------------------------------------------------------ */ > > -static unsigned int video_debug = 0; > -module_param(video_debug,int,0644); > +static unsigned int video_debug; > +module_param(video_debug, int, 0644); > MODULE_PARM_DESC(video_debug,"enable debug messages [video]"); > > -#define dprintk(level,fmt, arg...) if (video_debug >= level) \ > - printk(KERN_DEBUG "v4l2_extension: " fmt, ## arg) > +#define dprintk(level,fmt, arg...) do { \ > + if (video_debug >= level) \ > + printk(KERN_DEBUG "v4l2_extension: " fmt, ## arg); \ > +} while (0) > > static DEFINE_MUTEX(v4l2ext_lock); > /* Device list management stuff. One entry per managed device */ > static LIST_HEAD(v4l2ext_devlist); > /* Bitmask marking allocated devices from 0 to V4L2EXT_MAXDEV */ > /* This is useful for limiting the number of managed devices */ > -static unsigned long v4l2ext_devused=0; > - > -static unsigned int video_nr[] = {[0 ... (V4L2EXT_MAXDEV - 1)] = UNSET }; > +static unsigned long v4l2ext_devused; > + > +static unsigned int video_nr[] = { [0 ... (V4L2EXT_MAXDEV - 1)] = UNSET }; > > /* ------------------------------------------------------------------ */ > /* Standard device driver I/O entry points implementation */ > @@ -69,23 +69,23 @@ static int video_open(struct inode *inod > list_for_each(list,&v4l2ext_devlist) { > h = list_entry(list, struct v4l2ext, devlist); > if (h->vdev->minor == minor) { > - dev = h; > + dev = h; > } > } > - if (NULL == dev) > + if (dev == NULL) > return -ENODEV; > > - file->private_data=dev; > - > - dprintk(1,"open %d\n",minor); > + file->private_data = dev; > + > + dprintk(1, "open %d\n", minor); > > /* Now calling the base v4l2 driver's open to lock the device */ > /* we pass a fake file structure that will be used each time > a base v4l2 driver's entry point will need to be called */ > base_dev = dev->base_vdev; > - if(base_dev->fops->open) > + if (base_dev->fops->open) > return base_dev->fops->open(dev->fake_file.f_dentry->d_inode, > - &(dev->fake_file)); > + &dev->fake_file); > else > return -EINVAL; > } > @@ -96,8 +96,8 @@ video_read(struct file *file, char __use > struct v4l2ext *dev = file->private_data; > struct video_device *base_dev = dev->base_vdev; > > - if(base_dev->fops->read) > - return base_dev->fops->read(&(dev->fake_file),data,count,ppos); > + if (base_dev->fops->read) > + return base_dev->fops->read(&dev->fake_file, data, count, ppos); > else > return -EINVAL; > } > @@ -108,8 +108,8 @@ video_poll(struct file *file, struct pol > struct v4l2ext *dev = file->private_data; > struct video_device *base_dev = dev->base_vdev; > > - if(base_dev->fops->poll) > - return base_dev->fops->poll(&(dev->fake_file),wait); > + if (base_dev->fops->poll) > + return base_dev->fops->poll(&dev->fake_file,wait); > else > return -EINVAL; > } > @@ -119,21 +119,21 @@ static int video_release(struct inode *i > struct v4l2ext *dev = file->private_data; > struct video_device *base_dev = dev->base_vdev; > > - if(base_dev->fops->release) > + if (base_dev->fops->release) > return base_dev->fops->release(dev->fake_file.f_dentry->d_inode, > - &(dev->fake_file)); > + &dev->fake_file); > else > return -EINVAL; > } > > static int > -video_mmap(struct file *file, struct vm_area_struct * vma) > +video_mmap(struct file *file, struct vm_area_struct *vma) > { > struct v4l2ext *dev = file->private_data; > struct video_device *base_dev = dev->base_vdev; > > - if(base_dev->fops->mmap) > - return base_dev->fops->mmap(&(dev->fake_file),vma); > + if (base_dev->fops->mmap) > + return base_dev->fops->mmap(&dev->fake_file, vma); > else > return -EINVAL; > } > @@ -141,248 +141,248 @@ video_mmap(struct file *file, struct vm_ > /* ------------------------------------------------------------------ */ > /* Specific v4l ioctl implementation using video_ioctl2 facility */ > /* ------------------------------------------------------------------ */ > -static int vidioc_querycap (struct file *file, void *priv, > +static int vidioc_querycap(struct file *file, void *priv, > struct v4l2_capability *vc) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - int ret=0; > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + int ret = 0; > > /* FIXME: should call the helper daemon to extend capabilities */ > - if(base_dev->vidioc_querycap) { > - ret = base_dev->vidioc_querycap(&(dev->fake_file), > + if (base_dev->vidioc_querycap) { > + ret = base_dev->vidioc_querycap(&dev->fake_file, > dev->fake_file.private_data, > vc); > - strlcpy(vc->driver,dev->vdev->name,sizeof(vc->driver)); > + strlcpy(vc->driver, dev->vdev->name, sizeof(vc->driver)); > } > return ret; > } > > -static int vidioc_g_input (struct file *file, void *priv, unsigned int *input) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_g_input) > - return base_dev->vidioc_g_input(&(dev->fake_file), > +static int vidioc_g_input(struct file *file, void *priv, unsigned int *input) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_g_input) > + return base_dev->vidioc_g_input(&dev->fake_file, > dev->fake_file.private_data, > input); > else > return -EINVAL; > } > > -static int vidioc_enum_input (struct file *file, void *priv, > +static int vidioc_enum_input(struct file *file, void *priv, > struct v4l2_input *vi) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_enum_input) > - return base_dev->vidioc_enum_input(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_enum_input) > + return base_dev->vidioc_enum_input(&dev->fake_file, > dev->fake_file.private_data, > vi); > else > return -EINVAL; > } > > -static int vidioc_s_input (struct file *file, void *priv, unsigned int input) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_input) > - return base_dev->vidioc_s_input(&(dev->fake_file), > +static int vidioc_s_input(struct file *file, void *priv, unsigned int input) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_input) > + return base_dev->vidioc_s_input(&dev->fake_file, > dev->fake_file.private_data, > input); > else > return -EINVAL; > } > > -static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_std) > - return base_dev->vidioc_s_std(&(dev->fake_file), > +static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_std) > + return base_dev->vidioc_s_std(&dev->fake_file, > dev->fake_file.private_data, > id); > else > return -EINVAL; > } > > -static int vidioc_g_tuner (struct file *file, void *priv, > +static int vidioc_g_tuner(struct file *file, void *priv, > struct v4l2_tuner *vt) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_g_tuner) > - return base_dev->vidioc_g_tuner(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_g_tuner) > + return base_dev->vidioc_g_tuner(&dev->fake_file, > dev->fake_file.private_data, > vt); > else > return -EINVAL; > } > > -static int vidioc_s_tuner (struct file *file, void *priv, > +static int vidioc_s_tuner(struct file *file, void *priv, > struct v4l2_tuner *vt) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_tuner) > - return base_dev->vidioc_s_tuner(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_tuner) > + return base_dev->vidioc_s_tuner(&dev->fake_file, > dev->fake_file.private_data, > vt); > else > return -EINVAL; > } > > -static int vidioc_g_frequency (struct file *file, void *priv, > +static int vidioc_g_frequency(struct file *file, void *priv, > struct v4l2_frequency *freq) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_g_frequency) > - return base_dev->vidioc_g_frequency(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_g_frequency) > + return base_dev->vidioc_g_frequency(&dev->fake_file, > dev->fake_file.private_data, > freq); > else > return -EINVAL; > } > > -static int vidioc_s_frequency (struct file *file, void *priv, > +static int vidioc_s_frequency(struct file *file, void *priv, > struct v4l2_frequency *freq) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_frequency) > - return base_dev->vidioc_s_frequency(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_frequency) > + return base_dev->vidioc_s_frequency(&dev->fake_file, > dev->fake_file.private_data, > freq); > else > return -EINVAL; > } > > -static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_g_audio) > - return base_dev->vidioc_g_audio(&(dev->fake_file), > +static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_g_audio) > + return base_dev->vidioc_g_audio(&dev->fake_file, > dev->fake_file.private_data, > a); > else > return -EINVAL; > } > > -static int vidioc_s_audio (struct file *file, void *priv, struct v4l2_audio *a) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_audio) > - return base_dev->vidioc_s_audio(&(dev->fake_file), > +static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_audio) > + return base_dev->vidioc_s_audio(&dev->fake_file, > dev->fake_file.private_data, > a); > else > return -EINVAL; > } > > -static int vidioc_queryctrl (struct file *file, void *priv, > +static int vidioc_queryctrl(struct file *file, void *priv, > struct v4l2_queryctrl *ctrl) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_queryctrl) > - return base_dev->vidioc_queryctrl(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_queryctrl) > + return base_dev->vidioc_queryctrl(&dev->fake_file, > dev->fake_file.private_data, > ctrl); > else > return -EINVAL; > } > > -static int vidioc_g_ctrl (struct file *file, void *priv, > +static int vidioc_g_ctrl(struct file *file, void *priv, > struct v4l2_control *ctrl) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_g_ctrl) > - return base_dev->vidioc_g_ctrl(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_g_ctrl) > + return base_dev->vidioc_g_ctrl(&dev->fake_file, > dev->fake_file.private_data, > ctrl); > else > return -EINVAL; > } > > -static int vidioc_s_ctrl (struct file *file, void *priv, > +static int vidioc_s_ctrl(struct file *file, void *priv, > struct v4l2_control *ctrl) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_ctrl) > - return base_dev->vidioc_s_ctrl(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_ctrl) > + return base_dev->vidioc_s_ctrl(&dev->fake_file, > dev->fake_file.private_data, > ctrl); > else > return -EINVAL; > } > > -static int vidioc_reqbufs (struct file *file, > +static int vidioc_reqbufs(struct file *file, > void *priv, struct v4l2_requestbuffers *vr) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_reqbufs) > - return base_dev->vidioc_reqbufs(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_reqbufs) > + return base_dev->vidioc_reqbufs(&dev->fake_file, > dev->fake_file.private_data, > vr); > else > return -EINVAL; > } > > -static int vidioc_querybuf (struct file *file, > +static int vidioc_querybuf(struct file *file, > void *priv, struct v4l2_buffer *vb) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_querybuf) > - return base_dev->vidioc_querybuf(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_querybuf) > + return base_dev->vidioc_querybuf(&dev->fake_file, > dev->fake_file.private_data, > vb); > else > return -EINVAL; > } > > -static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_qbuf) > - return base_dev->vidioc_qbuf(&(dev->fake_file), > +static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *vb) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_qbuf) > + return base_dev->vidioc_qbuf(&dev->fake_file, > dev->fake_file.private_data, > vb); > else > return -EINVAL; > } > > -static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb) > -{ > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_dqbuf) > - return base_dev->vidioc_dqbuf(&(dev->fake_file), > +static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *vb) > +{ > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_dqbuf) > + return base_dev->vidioc_dqbuf(&dev->fake_file, > dev->fake_file.private_data, > vb); > else > @@ -392,11 +392,11 @@ static int vidioc_streamon(struct file * > static int vidioc_streamon(struct file *file, > void *priv, enum v4l2_buf_type type) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_streamon) > - return base_dev->vidioc_streamon(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_streamon) > + return base_dev->vidioc_streamon(&dev->fake_file, > dev->fake_file.private_data, > type); > else > @@ -406,53 +406,53 @@ static int vidioc_streamoff(struct file > static int vidioc_streamoff(struct file *file, > void *priv, enum v4l2_buf_type type) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_streamoff) > - return base_dev->vidioc_streamoff(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_streamoff) > + return base_dev->vidioc_streamoff(&dev->fake_file, > dev->fake_file.private_data, > type); > else > return -EINVAL; > } > > -static int vidioc_enum_fmt_cap (struct file *file, void *priv, > +static int vidioc_enum_fmt_cap(struct file *file, void *priv, > struct v4l2_fmtdesc *vfd) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_enum_fmt_cap) > - return base_dev->vidioc_enum_fmt_cap(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_enum_fmt_cap) > + return base_dev->vidioc_enum_fmt_cap(&dev->fake_file, > dev->fake_file.private_data, > vfd); > else > return -EINVAL; > } > > -static int vidioc_g_fmt_cap (struct file *file, void *priv, > +static int vidioc_g_fmt_cap(struct file *file, void *priv, > struct v4l2_format *vf) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_g_fmt_cap) > - return base_dev->vidioc_g_fmt_cap(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_g_fmt_cap) > + return base_dev->vidioc_g_fmt_cap(&dev->fake_file, > dev->fake_file.private_data, > vf); > else > return -EINVAL; > } > > -static int vidioc_try_fmt_cap (struct file *file, void *priv, > +static int vidioc_try_fmt_cap(struct file *file, void *priv, > struct v4l2_format *vf) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_try_fmt_cap) > - return base_dev->vidioc_try_fmt_cap(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_try_fmt_cap) > + return base_dev->vidioc_try_fmt_cap(&dev->fake_file, > dev->fake_file.private_data, > vf); > else > @@ -462,11 +462,11 @@ static int vidioc_s_fmt_cap(struct file > static int vidioc_s_fmt_cap(struct file *file, void *priv, > struct v4l2_format *vf) > { > - struct v4l2ext *dev = (struct v4l2ext *)priv; > - struct video_device *base_dev = dev->base_vdev; > - > - if(base_dev->vidioc_s_fmt_cap) > - return base_dev->vidioc_s_fmt_cap(&(dev->fake_file), > + struct v4l2ext *dev = priv; > + struct video_device *base_dev = dev->base_vdev; > + > + if (base_dev->vidioc_s_fmt_cap) > + return base_dev->vidioc_s_fmt_cap(&dev->fake_file, > dev->fake_file.private_data, > vf); > else > @@ -477,62 +477,61 @@ static int vidioc_s_fmt_cap(struct file > /* ----------------------------------------------------------- */ > /* exported stuff */ > > -static const struct file_operations video_fops = > -{ > - .owner = THIS_MODULE, > - .open = video_open, > - .release = video_release, > - .read = video_read, > - .poll = video_poll, > - .mmap = video_mmap, > - .ioctl = video_ioctl2, > - .llseek = no_llseek, > +static const struct file_operations video_fops = { > + .owner = THIS_MODULE, > + .open = video_open, > + .release = video_release, > + .read = video_read, > + .poll = video_poll, > + .mmap = video_mmap, > + .ioctl = video_ioctl2, > + .llseek = no_llseek, > }; > > static struct video_device v4l2ext_video_template = { > - .owner = THIS_MODULE, > - .type = 0, /* filled dynamically */ > - .hardware = 0, /* filled dynamically */ > - .fops = &video_fops, > - .name = "", > - .release = video_device_release, > - .minor = -1, > - .vidioc_querycap = vidioc_querycap, > - .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, > - .vidioc_g_fmt_cap = vidioc_g_fmt_cap, > - .vidioc_try_fmt_cap = vidioc_try_fmt_cap, > - .vidioc_s_fmt_cap = vidioc_s_fmt_cap, > - .vidioc_reqbufs = vidioc_reqbufs, > - .vidioc_querybuf = vidioc_querybuf, > - .vidioc_qbuf = vidioc_qbuf, > - .vidioc_dqbuf = vidioc_dqbuf, > - .vidioc_s_std = vidioc_s_std, > - .vidioc_enum_input = vidioc_enum_input, > - .vidioc_g_input = vidioc_g_input, > - .vidioc_s_input = vidioc_s_input, > - .vidioc_queryctrl = vidioc_queryctrl, > - .vidioc_g_audio = vidioc_g_audio, > - .vidioc_g_audio = vidioc_s_audio, > - .vidioc_g_ctrl = vidioc_g_ctrl, > - .vidioc_s_ctrl = vidioc_s_ctrl, > - .vidioc_streamon = vidioc_streamon, > - .vidioc_streamoff = vidioc_streamoff, > + .owner = THIS_MODULE, > + .type = 0, /* filled dynamically */ > + .hardware = 0, /* filled dynamically */ > + .fops = &video_fops, > + .name = "", > + .release = video_device_release, > + .minor = -1, > + .vidioc_querycap = vidioc_querycap, > + .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, > + .vidioc_g_fmt_cap = vidioc_g_fmt_cap, > + .vidioc_try_fmt_cap = vidioc_try_fmt_cap, > + .vidioc_s_fmt_cap = vidioc_s_fmt_cap, > + .vidioc_reqbufs = vidioc_reqbufs, > + .vidioc_querybuf = vidioc_querybuf, > + .vidioc_qbuf = vidioc_qbuf, > + .vidioc_dqbuf = vidioc_dqbuf, > + .vidioc_s_std = vidioc_s_std, > + .vidioc_enum_input = vidioc_enum_input, > + .vidioc_g_input = vidioc_g_input, > + .vidioc_s_input = vidioc_s_input, > + .vidioc_queryctrl = vidioc_queryctrl, > + .vidioc_g_audio = vidioc_g_audio, > + .vidioc_g_audio = vidioc_s_audio, > + .vidioc_g_ctrl = vidioc_g_ctrl, > + .vidioc_s_ctrl = vidioc_s_ctrl, > + .vidioc_streamon = vidioc_streamon, > + .vidioc_streamoff = vidioc_streamoff, > #ifdef CONFIG_VIDEO_V4L1_COMPAT > -/* .vidiocgmbuf = vidiocgmbuf, */ > +/* .vidiocgmbuf = vidiocgmbuf, */ > #endif > - .vidioc_g_tuner = vidioc_g_tuner, > - .vidioc_s_tuner = vidioc_s_tuner, > - .vidioc_g_frequency = vidioc_g_frequency, > - .vidioc_s_frequency = vidioc_s_frequency, > - .tvnorms = 0, > - .current_norm = 0 > + .vidioc_g_tuner = vidioc_g_tuner, > + .vidioc_s_tuner = vidioc_s_tuner, > + .vidioc_g_frequency = vidioc_g_frequency, > + .vidioc_s_frequency = vidioc_s_frequency, > + .tvnorms = 0, > + .current_norm = 0 > }; > > /* ----------------------------------------------------------- */ > > static int v4l2ext_init(void) > { > - printk(KERN_INFO "v4l2 extension module version %d.%d.%d loaded\n", > + printk(KERN_INFO "v4l2 extension module version %d.%d.%d loaded\n", > (V4L2EXT_VERSION_CODE >> 16) & 0xff, > (V4L2EXT_VERSION_CODE >> 8) & 0xff, > V4L2EXT_VERSION_CODE & 0xff); > @@ -552,7 +551,7 @@ static void v4l2ext_fini(void) > v4l2ext_hlp_fini(); > > /* remove any registered base v4l structure */ > - list_for_each(list,&v4l2ext_devlist) { > + list_for_each(list, &v4l2ext_devlist) { > h = list_entry(list, struct v4l2ext, devlist); > v4l2ext_unregister(h->base_vdev); > } > @@ -566,28 +565,28 @@ int v4l2ext_register(struct video_device > struct v4l2ext *dev = NULL; > struct inode *fake_inode = NULL; > int nr; > - int ret=0; > + int ret = 0; > > mutex_lock(&v4l2ext_lock); > /* check if we have not reached the maximum number of > devices this extended driver can manage */ > - nr=find_first_zero_bit(&v4l2ext_devused,V4L2EXT_MAXDEV); > + nr = find_first_zero_bit(&v4l2ext_devused, V4L2EXT_MAXDEV); > if (nr >= V4L2EXT_MAXDEV) { > - printk("This driver supports only %d device creations\n", > - V4L2EXT_MAXDEV); > - ret=-ENOSPC; > + printk(KERN_ERR "This driver supports only %d device " > + "creations\n", V4L2EXT_MAXDEV); > + ret = -ENOSPC; > goto out_unlock; > } > > /* reserve this entry */ > - v4l2ext_devused|=1<<nr; > + v4l2ext_devused |= 1 << nr; > > mutex_unlock(&v4l2ext_lock); > > /* allocate and initialize device private data structure */ > - dev = kzalloc(sizeof(*dev),GFP_KERNEL); > - if (NULL == dev) { > - printk("cannot allocate device.\n"); > + dev = kzalloc(sizeof(*dev), GFP_KERNEL); > + if (dev == NULL) { > + printk(KERN_ERR "cannot allocate device.\n"); > ret = -ENOMEM; > goto out_free; > } > @@ -597,17 +596,17 @@ int v4l2ext_register(struct video_device > > /* fill the fake parameters that will be passed to the v4l2 base > driver entry point */ > - fake_inode = kzalloc(sizeof(struct inode),GFP_KERNEL); > - if(NULL == fake_inode) { > - printk("cannot allocate fake inode.\n"); > + fake_inode = kzalloc(sizeof(struct inode), GFP_KERNEL); > + if (fake_inode == NULL) { > + printk(KERN_ERR "cannot allocate fake inode.\n"); > ret = -ENOMEM; > goto out_free; > } > fake_inode->i_rdev = MKDEV(VIDEO_MAJOR, base_vdev->minor); > dev->fake_file.f_dentry = kzalloc(sizeof(struct dentry), > GFP_KERNEL); > - if(NULL == dev->fake_file.f_dentry) { > - printk("cannot allocate fake f_dentry.\n"); > + if (dev->fake_file.f_dentry == NULL) { > + printk(KERN_ERR "cannot allocate fake f_dentry.\n"); > ret = -ENOMEM; > goto out_free; > } > @@ -615,8 +614,8 @@ int v4l2ext_register(struct video_device > > /* allocate and fill v4l2 device struct */ > dev->vdev = video_device_alloc(); > - if (NULL == dev->vdev) { > - printk("cannot allocate video_device.\n"); > + if (dev->vdev == NULL) { > + printk(KERN_ERR "cannot allocate video_device.\n"); > ret = -ENOMEM; > goto out_free; > } > @@ -631,32 +630,34 @@ int v4l2ext_register(struct video_device > dev->vdev->minor = -1; > dev->vdev->dev = NULL; > /* prefix with "Ext." the base device name */ > - strcpy(dev->vdev->name,"Ext. "); > - strncpy(dev->vdev->name+5, > + strcpy(dev->vdev->name, "Ext. "); > + strncpy(dev->vdev->name + 5, > base_vdev->name, > - sizeof(dev->vdev->name)-5); > - > - if ((ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER, > - video_nr[dev->dev_nr]))) { > - printk("error on registering video device [%d].\n", > + sizeof(dev->vdev->name) - 5); > + > + ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER, > + video_nr[dev->dev_nr]); > + if (ret) { > + printk(KERN_ERR "error on registering video device [%d].\n", > dev->dev_nr); > - ret=-ENODEV; > + ret = -ENODEV; > goto out_free; > } > > mutex_lock(&v4l2ext_lock); > - list_add_tail(&dev->devlist,&v4l2ext_devlist); > + list_add_tail(&dev->devlist, &v4l2ext_devlist); > > mutex_unlock(&v4l2ext_lock); > - printk("v4l2_extension: Added (%s) driver extension\n", > + printk(KERN_INFO "v4l2_extension: Added (%s) driver extension\n", > dev->vdev->name); > > return 0; > > /* Error case, cleanup what must be cleaned */ > out_free: > - v4l2ext_devused&=~(1<<nr); > - if(dev) video_device_release(dev->vdev); > + v4l2ext_devused &= ~(1 << nr); > + if (dev) > + video_device_release(dev->vdev); > kfree(dev); > kfree(fake_inode); > kfree(dev->fake_file.f_dentry); > @@ -672,7 +673,7 @@ void v4l2ext_unregister(struct video_dev > void v4l2ext_unregister(struct video_device *base_vdev) > { > struct v4l2ext *h; > - struct v4l2ext *dev=NULL; > + struct v4l2ext *dev = NULL; > struct list_head *list; > > mutex_lock(&v4l2ext_lock); > @@ -686,24 +687,23 @@ void v4l2ext_unregister(struct video_dev > dev = h; > } > } > - if(dev != NULL) { > + if (dev != NULL) { > list_del(&dev->devlist); > > - v4l2ext_devused&=~(1<<dev->dev_nr); > + v4l2ext_devused &= ~(1 << dev->dev_nr); > > /* unregister the corresponding v4l2 extended device > entry point */ > video_unregister_device(dev->vdev); > > - printk("V4l2 extension: Removed (%s) extension\n", > + printk(KERN_INFO "V4l2 extension: Removed (%s) extension\n", > base_vdev->name); > kfree(dev->fake_file.f_dentry->d_inode); > kfree(dev->fake_file.f_dentry); > kfree(dev); > - } > - else { > - printk("V4l2 extension: could not find any %s extension!\n", > - base_vdev->name); > + } else { > + printk(KERN_ERR "V4l2 extension: could not find any %s " > + "extension!\n", base_vdev->name); > } > > mutex_unlock(&v4l2ext_lock); > diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension.h b/linux/drivers/media/video/v4l2_extension/v4l2_extension.h > --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension.h > +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension.h > @@ -1,5 +1,4 @@ > /* > - * > * v4l2 extension module - extends some video device drivers to provide > * standard video formats using userspace helper > * daemon > > Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/ Thierry

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

V4L2-library October 2007