open-sasc-ng/2.6.38.patch

   1 Only in sc/contrib/sasc-ng: config.mak
   2 diff -ru sc/contrib/sasc-ng/dvbloopback/module/dvblb_forward.c sc-build/contrib/sasc-ng/dvbloopback/module/dvblb_forward.c
   3 --- sc/contrib/sasc-ng/dvbloopback/module/dvblb_forward.c       2011-04-27 09:36:37.197065902 +0300
   4 +++ sc-build/contrib/sasc-ng/dvbloopback/module/dvblb_forward.c 2011-04-27 09:42:23.640415717 +0300
   5 @@ -166,9 +166,9 @@
   6         struct file *ftmp = find_forwardmap(lbdev, f->private_data);
   7         if (!ftmp || IS_ERR(ftmp))
   8                 return -EFAULT;
   9 -       if (lbdev->forward_dev->fops &&lbdev->forward_dev->fops->ioctl)
  10 -               return lbdev->forward_dev->fops->ioctl(
  11 -                          ftmp->f_dentry->d_inode, ftmp, cmd, arg);
  12 +       if (lbdev->forward_dev->fops &&lbdev->forward_dev->fops->unlocked_ioctl)
  13 +               return lbdev->forward_dev->fops->unlocked_ioctl(
  14 +                          ftmp, cmd, arg);
  15         return -EFAULT;
  16  }
  17
  18 diff -ru sc/contrib/sasc-ng/dvbloopback/module/dvb_loopback.c sc-build/contrib/sasc-ng/dvbloopback/module/dvb_loopback.c
  19 --- sc/contrib/sasc-ng/dvbloopback/module/dvb_loopback.c        2011-04-27 09:36:37.197065902 +0300
  20 +++ sc-build/contrib/sasc-ng/dvbloopback/module/dvb_loopback.c  2011-04-27 09:41:54.984751422 +0300
  21 @@ -118,9 +118,9 @@
  22  /* This is a copy of dvb_usercopy.  We need to do this because it isn't exported
  23     by dvbdev
  24  */
  25 -static int dvblb_usercopy(struct inode *inode, struct file *file,
  26 +static int dvblb_usercopy(struct file *file,
  27                      unsigned int cmd, unsigned long arg,
  28 -                    int (*func)(struct inode *inode, struct file *file,
  29 +                    int (*func)(struct file *file,
  30                      unsigned int cmd, void *arg))
  31  {
  32         char    sbuf[128];
  33 @@ -180,7 +180,7 @@
  34         }
  35
  36         /* call driver */
  37 -       if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
  38 +       if ((err = func(file, cmd, parg)) == -ENOIOCTLCMD)
  39                 err = -EINVAL;
  40
  41         if (err < 0)
  42 @@ -663,7 +663,7 @@
  43     dvb_generic_ioctl) which is called by dvblb_ioctl for device-0.  It is
  44     used to forward ioctl commands back to the userspace application
  45  */
  46 -static int dvblb_looped_ioctl(struct inode *inode, struct file *f,
  47 +static int dvblb_looped_ioctl(struct file *f,
  48         unsigned int cmd, void *parg)
  49  {
  50         int ret;
  51 @@ -692,7 +692,7 @@
  52         return ret;
  53  }
  54
  55 -static int dvblb_ioctl(struct inode *inode, struct file *f,
  56 +static int dvblb_ioctl(struct file *f,
  57         unsigned int cmd, unsigned long arg)
  58  {
  59         void * parg = (void *)arg;
  60 @@ -722,8 +722,7 @@
  61                 /* This is the looped device */
  62                 if (lbdev->forward_dev)
  63                         return dvblb_forward_ioctl(lbdev, f, cmd, arg);
  64 -
  65 -               return dvblb_usercopy (inode, f, cmd, arg,
  66 +                       return dvblb_usercopy (f, cmd, arg,
  67                                        dvbdev->kernel_ioctl);
  68         }
  69         /* This is the userspace control device */
  70 @@ -978,7 +977,7 @@
  71         .write          = dvblb_write,
  72         .poll           = dvblb_poll,
  73         .mmap           = dvblb_mmap,
  74 -       .ioctl          = dvblb_ioctl,
  75 +       .unlocked_ioctl = dvblb_ioctl,
  76  };
  77
  78  static struct dvb_device dvbdev_looped = {
  79 @@ -998,7 +997,7 @@
  80         .write          = dvblb_write,
  81         .poll           = dvblb_poll,
  82         .mmap           = dvblb_mmap,
  83 -       .ioctl          = dvblb_ioctl,
  84 +        .unlocked_ioctl = dvblb_ioctl,
  85  };
  86
  87  static struct dvb_device dvbdev_userspace = {
  88 diff -ru sc/contrib/sasc-ng/Makefile sc-build/contrib/sasc-ng/Makefile
  89 --- sc/contrib/sasc-ng/Makefile 2011-04-27 09:36:37.193734235 +0300
  90 +++ sc-build/contrib/sasc-ng/Makefile   2011-04-27 09:44:40.072162363 +0300
  91 @@ -8,7 +8,7 @@
  92
  93  CC       ?= gcc
  94  CXX      ?= g++
  95 -CXXFLAGS ?= -Wall -D__user= -Werror
  96 +CXXFLAGS ?= -Wall -D__user=
  97  CFLAGS   ?= -Wall -D__user=
  98
  99  ifdef DVB_DIR
 100 @@ -57,7 +57,7 @@
 101  INC_DEPS := $(shell ls $(LBDIR)/*.h) dvbloopback/module/dvbloopback.h
 102  INC_DEPS_LB := $(shell ls dvblb_plugins/*.h)
 103
 104 -LIBS = -lpthread -lcrypto -lcrypt
 105 +LIBS = -lpthread -lcrypto -lcrypt -lv4l1
 106
 107  all: $(TOOL) libscanwrap.so
 108
 109 diff -ru sc/contrib/sasc-ng/sc/dvbdevice.cpp sc-build/contrib/sasc-ng/sc/dvbdevice.cpp
 110 --- sc/contrib/sasc-ng/sc/dvbdevice.cpp 2011-04-27 09:36:37.207060903 +0300
 111 +++ sc-build/contrib/sasc-ng/sc/dvbdevice.cpp   2011-04-27 09:42:51.956250022 +0300
 112 @@ -10,7 +10,7 @@
 113  #include "include/vdr/dvbdevice.h"
 114  #include <errno.h>
 115  #include <limits.h>
 116 -#include <linux/videodev.h>
 117 +#include <libv4l1-videodev.h>
 118  #include <linux/dvb/audio.h>
 119  #include <linux/dvb/dmx.h>
 120  #include <linux/dvb/frontend.h>