[CVS] v4l2 Makefile, 1.1.1.1, 1.2 generic.c, 1.22, 1.23 generic.h, 1.12, 1.13

[Receive n. of C. c. <gat...@li...>]

Update of /cvsroot/gatos/v4l2
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14218

Modified Files:
	Makefile generic.c generic.h 
Log Message:

Should compile on 2.6.27 now


Index: generic.h
===================================================================
RCS file: /cvsroot/gatos/v4l2/generic.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- generic.h	30 Mar 2008 13:21:01 -0000	1.12
+++ generic.h	21 Dec 2008 21:35:13 -0000	1.13
@@ -43,6 +43,9 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 #include <media/v4l2-common.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+#include <media/v4l2-ioctl.h>
+#endif
 #define GENERIC_VERSION_CODE KERNEL_VERSION(0,0,1)
 #define MAX_CARDS 10
 #ifdef dprintk

Index: generic.c
===================================================================
RCS file: /cvsroot/gatos/v4l2/generic.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- generic.c	30 Mar 2008 13:21:00 -0000	1.22
+++ generic.c	21 Dec 2008 21:35:13 -0000	1.23
@@ -262,7 +262,6 @@
 /* for each file operation assign a function to handle them */
 static struct file_operations generic_fops =
 {
-        owner:     THIS_MODULE,
         llseek:    no_llseek, /* cant seek on a capture card */
         read:      generic_read,
         write:     generic_write,
@@ -271,27 +270,34 @@
         open:      generic_open,
         release:   generic_release,
         poll:      generic_poll,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)	
+        owner:     THIS_MODULE,
+#endif	
 };
 
 /* defaults for setting up a cards video4linux capture device */
 static struct video_device generic_video_template =
 {
-        owner:     THIS_MODULE,
         name:      "UNSET",
-        type:      VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
-                   VID_TYPE_CLIPPING|VID_TYPE_SCALES,
         fops:      &generic_fops, /* file operations table above */
 	release:   video_device_release, 
         minor:     -1,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)	
+        owner:     THIS_MODULE,
+        type:      VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
+                   VID_TYPE_CLIPPING|VID_TYPE_SCALES,
+#endif		   
 };
 
 /* defaults for boards that support closed captioning interface */
 static struct video_device generic_vbi_template =
 {
         name:      "generic vbi",
-        type:      VID_TYPE_TUNER|VID_TYPE_TELETEXT,
         fops:      &generic_fops, /* file operations table above */
         minor:     -1,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)	
+        type:      VID_TYPE_TUNER|VID_TYPE_TELETEXT,
+#endif
 };
 
 /* list properties of different card models here 
@@ -2842,7 +2848,7 @@
                 return NULL;
         *vfd = *template;
         vfd->minor   = -1;
-        vfd->dev     = &card->dev->dev;
+        //vfd->dev     = &card->dev->dev;
         vfd->release = video_device_release;
         snprintf (vfd->name, sizeof(vfd->name),
   	  "genericv4l rev %d",card->revision);

Index: Makefile
===================================================================
RCS file: /cvsroot/gatos/v4l2/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	11 Jan 2005 21:11:05 -0000	1.1.1.1
+++ Makefile	21 Dec 2008 21:35:13 -0000	1.2
@@ -1,3 +1,3 @@
-KERNEL	:= $(shell uname -r | cut -c0-3)
+KERNEL	:= $(shell uname -r | cut -c1-3)
 
 include $(PWD)/Makefile_$(KERNEL)