[PATCH 2.5.8-pre1] motioneye video driver

[PATCH 2.5.8-pre1] motioneye video driver

[Stelian Pop]

In 2.5.8-pre1 'video_generic_ioctl' has gone, replaced by 
'video_generic_ioctl'. However, no video driver has been
updated to use the new API.

The Gerd's patches from http://bytesex.org/patches/2.5/
must be applied.

Attached is the motioneye driver patch only, which I can
confirm it works properly.

Stelian.

===== drivers/media/video/meye.c 1.9 vs edited =====
--- 1.9/drivers/media/video/meye.c	Thu Mar 14 17:16:34 2002
+++ edited/drivers/media/video/meye.c	Thu Apr  4 11:08:17 2002
@@ -893,8 +893,8 @@
 	return 0;
 }
 
-static int meye_ioctl(struct inode *inode, struct file *file,
-		      unsigned int cmd, void *arg) {
+static int meye_do_ioctl(struct inode *inode, struct file *file,
+			 unsigned int cmd, void *arg) {
 
 	switch (cmd) {
 
@@ -1169,6 +1169,12 @@
 	return 0;
 }
 
+static int meye_ioctl(struct inode *inode, struct file *file,
+		     unsigned int cmd, unsigned long arg)
+{
+	return video_usercopy(inode, file, cmd, arg, meye_do_ioctl);
+}
+
 static int meye_mmap(struct file *file, struct vm_area_struct *vma) {
 	unsigned long start = vma->vm_start;
 	unsigned long size  = vma->vm_end - vma->vm_start;
@@ -1209,7 +1215,7 @@
 	open:		meye_open,
 	release:	meye_release,
 	mmap:		meye_mmap,
-	ioctl:		video_generic_ioctl,
+	ioctl:		meye_ioctl,
 	llseek:		no_llseek,
 };
 
@@ -1219,7 +1225,6 @@
 	type:		VID_TYPE_CAPTURE,
 	hardware:	VID_HARDWARE_MEYE,
 	fops:		&meye_fops,
-	kernel_ioctl:	meye_ioctl,
 };
 
 static int __devinit meye_probe(struct pci_dev *pcidev, 
-- 
Stelian Pop <stelian.pop@fr.alcove.com>
Alcove - http://www.alcove.com

Re: [PATCH 2.5.8-pre1] motioneye video driver

[Gerd Knorr]

On Thu, Apr 04, 2002 at 04:03:05PM +0200, Stelian Pop wrote:
> In 2.5.8-pre1 'video_generic_ioctl' has gone, replaced by 
> 'video_generic_ioctl'. However, no video driver has been
> updated to use the new API.
> 
> The Gerd's patches from http://bytesex.org/patches/2.5/
> must be applied.

Whoops.  BK did a great job with merging -pre1 into my tree.  I havn't
even noticed this.

Someone must have picked my lkml mail with the videodev changes and
feed it to Linus.  No problem, I had planed to submit it anyway.  Going
to mail the driver fixes to Linus now ...

  Gerd

-- 
#include </dev/tty>