smartcam/paolo-assis.patch

   1 37a38
   2 > #include <linux/sched.h>
   3 59c60
   4 < //#define SMARTCAM_DEBUG
   5 ---
   6 > #define SMARTCAM_DEBUG
   7 172c173
   8 <       printk(KERN_ALERT "smartcam (%s): vidioc_s_fmt_cap called\n\t\twidth=%d; \
   9 ---
  10 >       printk(KERN_ALERT "smartcam : vidioc_s_fmt_cap called\n\t\twidth=%d; \
  11 174c175
  12 <       current->comm, f->fmt.pix.width, f->fmt.pix.height, (char*)&f->fmt.pix.pixelformat,
  13 ---
  14 >       /*current->comm,*/ f->fmt.pix.width, f->fmt.pix.height, (char*)&f->fmt.pix.pixelformat,
  15 221a223
  16 >               SCAM_MSG("Bad memory type for v4l2_requestbuffers\n");
  17 244a247,248
  18 >       vidbuf->memory = V4L2_MEMORY_MMAP;
  19 >
  20 247c251
  21 <               SCAM_MSG("vidioc_querybuf called - invalid memory type\n");
  22 ---
  23 >               SCAM_MSG("vidioc_querybuf called - invalid memory type(%d!=%d)\n", V4L2_MEMORY_MMAP, vidbuf->memory);
  24 457c461
  25 < static int smartcam_open(struct inode *inode, struct file *file)
  26 ---
  27 > static int smartcam_open(/*struct inode *inode,*/ struct file *file)
  28 459,461c463,466
  29 <       int minor = 0;
  30 <       minor = iminor(inode);
  31 <       SCAM_MSG("(%s) %s called (minor=%d)\n", current->comm, __FUNCTION__, minor);
  32 ---
  33 >       //int minor = 0;
  34 >       //minor = iminor(inode);
  35 >       //SCAM_MSG("(%s) %s called (minor=%d)\n", current->comm, __FUNCTION__, minor);
  36 >       SCAM_MSG("(%s) %s called\n", current->comm, __FUNCTION__);
  37 467c472
  38 <       SCAM_MSG("(%s) %s called (count=%d, f_pos = %d)\n", current->comm, __FUNCTION__, count, (int) *f_pos);
  39 ---
  40 >       SCAM_MSG("(%s) %s called (count=%d, f_pos = %d)\n", current->comm, __FUNCTION__, (int) count, (int) *f_pos);
  41 518c523
  42 <       SCAM_MSG("(%s) %s called (count=%d, f_pos = %d)\n", current->comm, __FUNCTION__, count, (int) *f_pos);
  43 ---
  44 >       SCAM_MSG("(%s) %s called (count=%d, f_pos = %d)\n", current->comm, __FUNCTION__, (int) count, (int) *f_pos);
  45 541c546
  46 <           mask |= (POLLIN | POLLRDNORM)       /* readable */
  47 ---
  48 >           mask |= (POLLIN | POLLRDNORM);      /* readable */
  49 550c555
  50 < static int smartcam_release(struct inode *inode, struct file *file)
  51 ---
  52 > static int smartcam_release(/*struct inode *inode,*/ struct file *file)
  53 556c561
  54 < static const struct file_operations smartcam_fops = {
  55 ---
  56 > static const struct v4l2_file_operations smartcam_fops = {
  57 565c570
  58 <       .llseek         = no_llseek,
  59 ---
  60 >       /*.llseek         = no_llseek,*/
  61 599c604
  62 <       .vfl_type               = VID_TYPE_CAPTURE,
  63 ---
  64 >       .vfl_type               = VFL_TYPE_GRABBER,