avld/avld_0.1.4.patch

   1 diff -Naur a/video_device.c b/video_device.c
   2 --- a/video_device.c    2008-11-09 16:54:51.000000000 +0100
   3 +++ b/video_device.c    2010-01-12 15:15:52.000000000 +0100
   4 @@ -111,8 +111,12 @@
   5  /************************************************
   6  **************** V4L FUNCTIONS  ***************
   7  ************************************************/
   8 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
   9  static int v4l_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) {
  10 -
  11 +#else
  12 +static int v4l_ioctl(struct file *file, unsigned int cmd, unsigned long arg) {
  13 +#endif
  14 +
  15         switch(cmd) {
  16                 /* Get capabilities */
  17                 case VIDIOCGCAP:
  18 @@ -374,8 +378,12 @@
  19
  20  }
  21
  22 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
  23  static int v4l_open(struct inode *inode, struct file *file) {
  24 -
  25 +#else
  26 +static int v4l_open(struct file *file) {
  27 +#endif
  28 +
  29         #ifdef DEBUG
  30                 printk(KERNEL_PREFIX "entering v4l_open()\n");
  31         #endif
  32 @@ -386,8 +394,13 @@
  33
  34         return 0;
  35  }
  36 +
  37 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
  38  static int v4l_close(struct inode *inode, struct file *file) {
  39 -
  40 +#else
  41 +static int v4l_close(struct file *file) {
  42 +#endif
  43 +
  44         #ifdef DEBUG
  45                 printk(KERNEL_PREFIX "entering v4l_close()\n");
  46         #endif
  47 @@ -397,9 +410,6 @@
  48         return 0;
  49  }
  50
  51 -
  52 -
  53 -
  54  static int v4l_mmap(struct file *file, struct vm_area_struct *vma) {
  55
  56         struct page *page = NULL;
  57 @@ -616,7 +626,11 @@
  58         //kfree(vdev);
  59  }
  60
  61 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
  62  static struct file_operations v4l_fops = {
  63 +#else
  64 +static struct v4l2_file_operations v4l_fops = {
  65 +#endif
  66         owner:          THIS_MODULE,
  67         open:           v4l_open,
  68         release:        v4l_close,
  69 @@ -624,8 +638,10 @@
  70         mmap:           v4l_mmap,
  71         write:          v4l_write,
  72         ioctl:          v4l_ioctl,
  73 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
  74         compat_ioctl: v4l_compat_ioctl32,
  75         llseek:     no_llseek,
  76 +#endif
  77  };
  78  static struct video_device my_device = {
  79         name:           "Dummy video device",