Only in r5u870_patched_patched/: .r5u870.ko.cmd
Only in r5u870_patched_patched/: .r5u870.mod.o.cmd
Only in r5u870_patched_patched/: .r5u870.o.cmd
Only in r5u870_patched_patched/: .tmp_versions
Only in r5u870_patched_patched/: Module.symvers
diff -crB r5u870_patched/modules.order r5u870_patched_patched/modules.order
*** r5u870_patched/modules.order	Sat Dec 20 04:47:48 2008
--- r5u870_patched_patched/modules.order	Sat Sep 12 12:04:40 2009
***************
*** 1,2 ****
! kernel//home/edward/Documents/r5u870/r5u870_patched/usbcam/usbcam.ko
! kernel//home/edward/Documents/r5u870/r5u870_patched/r5u870.ko
--- 1,2 ----
! kernel//home/veprbl/Downloads/r5u870_patched/usbcam/usbcam.ko
! kernel//home/veprbl/Downloads/r5u870_patched/r5u870.ko
Only in r5u870_patched_patched/: r5u870.ko
Only in r5u870_patched_patched/: r5u870.mod.c
Only in r5u870_patched_patched/: r5u870.mod.o
Only in r5u870_patched_patched/: r5u870.o
Only in r5u870_patched_patched/usbcam: .usbcam.ko.cmd
Only in r5u870_patched_patched/usbcam: .usbcam.mod.o.cmd
Only in r5u870_patched_patched/usbcam: .usbcam.o.cmd
Only in r5u870_patched_patched/usbcam: .usbcam_buf.o.cmd
Only in r5u870_patched_patched/usbcam: .usbcam_dev.o.cmd
Only in r5u870_patched_patched/usbcam: .usbcam_fops.o.cmd
Only in r5u870_patched_patched/usbcam: .usbcam_util.o.cmd
diff -crB r5u870_patched/usbcam/modules.order r5u870_patched_patched/usbcam/modules.order
*** r5u870_patched/usbcam/modules.order	Sat Dec 20 04:47:48 2008
--- r5u870_patched_patched/usbcam/modules.order	Sat Sep 12 12:04:40 2009
***************
*** 1 ****
! kernel//home/edward/Documents/r5u870/r5u870_patched/usbcam/usbcam.ko
--- 1 ----
! kernel//home/veprbl/Downloads/r5u870_patched/usbcam/usbcam.ko
Only in r5u870_patched_patched/usbcam: usbcam.ko
Only in r5u870_patched_patched/usbcam: usbcam.mod.c
Only in r5u870_patched_patched/usbcam: usbcam.mod.o
Only in r5u870_patched_patched/usbcam: usbcam.o
Only in r5u870_patched_patched/usbcam: usbcam_buf.o
Only in r5u870_patched_patched/usbcam: usbcam_dev.o
diff -crB r5u870_patched/usbcam/usbcam_fops.c r5u870_patched_patched/usbcam/usbcam_fops.c
*** r5u870_patched/usbcam/usbcam_fops.c	Wed Dec 17 22:21:38 2008
--- r5u870_patched_patched/usbcam/usbcam_fops.c	Sat Sep 12 12:04:24 2009
***************
*** 124,130 ****
   * V4L file_operations callout implementations
   */
  
! static int usbcam_v4l_open(struct inode *inode, struct file *filp)
  {
  	struct usbcam_dev *udp;
  	struct usbcam_fh *ufp;
--- 124,130 ----
   * V4L file_operations callout implementations
   */
  
! static int usbcam_v4l_open(struct file *filp)
  {
  	struct usbcam_dev *udp;
  	struct usbcam_fh *ufp;
***************
*** 213,219 ****
  	return res;
  }
  
! static int usbcam_v4l_release(struct inode *inode, struct file *filp)
  {
  	struct usbcam_fh *ufp = (struct usbcam_fh *) filp->private_data;
  	struct usbcam_dev *udp = ufp->ufh_dev;
--- 213,219 ----
  	return res;
  }
  
! static int usbcam_v4l_release(struct file *filp)
  {
  	struct usbcam_fh *ufp = (struct usbcam_fh *) filp->private_data;
  	struct usbcam_dev *udp = ufp->ufh_dev;
***************
*** 518,525 ****
  		usbcam_drvname(udp->ud_minidrv),
  		sizeof(cap->driver));
  	strlcpy(cap->card, udp->ud_vdev.name, sizeof(cap->card));
! 	snprintf(cap->bus_info, sizeof(cap->bus_info),
! 		 "usb:%s", udp->ud_dev->dev.bus_id);
  	cap->version = udp->ud_minidrv->um_version;
  	cap->capabilities = (V4L2_CAP_VIDEO_CAPTURE |
  			     V4L2_CAP_READWRITE |
--- 518,525 ----
  		usbcam_drvname(udp->ud_minidrv),
  		sizeof(cap->driver));
  	strlcpy(cap->card, udp->ud_vdev.name, sizeof(cap->card));
! 	/*snprintf(cap->bus_info, sizeof(cap->bus_info),
! 		 "usb:%s", udp->ud_dev->dev.bus_id);*/
  	cap->version = udp->ud_minidrv->um_version;
  	cap->capabilities = (V4L2_CAP_VIDEO_CAPTURE |
  			     V4L2_CAP_READWRITE |
***************
*** 910,916 ****
  }
  
  /* Intercept calls to minidriver V4L handler thing for compat calls. */
! static int usbcam_v4l_int_ioctl(struct inode *inodep, struct file *filp,
  				unsigned int cmd, void *arg)
  {
      struct usbcam_fh        *ufp = (struct usbcam_fh *) filp->private_data;
--- 910,916 ----
  }
  
  /* Intercept calls to minidriver V4L handler thing for compat calls. */
! static long usbcam_v4l_int_ioctl(struct file *filp,
  				unsigned int cmd, void *arg)
  {
      struct usbcam_fh        *ufp = (struct usbcam_fh *) filp->private_data;
***************
*** 1155,1161 ****
  	}
  }
  
! static int usbcam_v4l_ioctl (struct inode *inodep, struct file *file,
  	       unsigned int cmd, unsigned long arg)
  {
      struct usbcam_fh        *ufp = (struct usbcam_fh *) file->private_data;
--- 1155,1161 ----
  	}
  }
  
! static long usbcam_v4l_ioctl (struct file *file,
  	       unsigned int cmd, unsigned long arg)
  {
      struct usbcam_fh        *ufp = (struct usbcam_fh *) file->private_data;
***************
*** 1167,1177 ****
  	if (_IOC_TYPE(cmd) == 'v')
  	{
  		// run our own internal ioctl handler for these V4L compat ioctl.
! 		return video_usercopy(inodep, file, cmd, arg, usbcam_v4l_int_ioctl);
  	}
  #endif
  	
! 	return video_ioctl2(inodep, file, cmd, arg);
  }
  
  /*
--- 1167,1177 ----
  	if (_IOC_TYPE(cmd) == 'v')
  	{
  		// run our own internal ioctl handler for these V4L compat ioctl.
! 		return video_usercopy(file, cmd, arg, usbcam_v4l_int_ioctl);
  	}
  #endif
  	
! 	return video_ioctl2(file, cmd, arg);
  }
  
  /*
***************
*** 1185,1191 ****
   * will refer to the minidriver module, not usbcam.
   */
  
! struct file_operations usbcam_v4l_fops_template = {
  	.owner		= THIS_MODULE,
  	.open		= usbcam_v4l_open,
  	.release	= usbcam_v4l_release,
--- 1185,1191 ----
   * will refer to the minidriver module, not usbcam.
   */
  
! struct v4l2_file_operations usbcam_v4l_fops_template = {
  	.owner		= THIS_MODULE,
  	.open		= usbcam_v4l_open,
  	.release	= usbcam_v4l_release,
***************
*** 1197,1203 ****
  #ifdef CONFIG_COMPAT
  	.compat_ioctl	= v4l_compat_ioctl32,
  #endif
! 	.llseek		= no_llseek,
  };
  
  
--- 1197,1203 ----
  #ifdef CONFIG_COMPAT
  	.compat_ioctl	= v4l_compat_ioctl32,
  #endif
! 	//.llseek		= no_llseek,
  };
  
  
Only in r5u870_patched_patched/usbcam: usbcam_fops.c~
Only in r5u870_patched_patched/usbcam: usbcam_fops.o
diff -crB r5u870_patched/usbcam/usbcam_priv.h r5u870_patched_patched/usbcam/usbcam_priv.h
*** r5u870_patched/usbcam/usbcam_priv.h	Wed Dec 17 21:11:59 2008
--- r5u870_patched_patched/usbcam/usbcam_priv.h	Sat Sep 12 11:57:48 2009
***************
*** 120,126 ****
  	struct mutex			um_lock;
  	const struct usbcam_dev_ops	*um_ops;
  	struct video_device		um_videodev_template;
! 	struct file_operations		um_v4l_fops;
  	const int			*um_video_nr_array;
  	int				um_video_nr_array_len;
  };
--- 120,126 ----
  	struct mutex			um_lock;
  	const struct usbcam_dev_ops	*um_ops;
  	struct video_device		um_videodev_template;
! 	struct v4l2_file_operations		um_v4l_fops;
  	const int			*um_video_nr_array;
  	int				um_video_nr_array_len;
  };
***************
*** 199,205 ****
  }
  
  extern struct videobuf_queue_ops usbcam_videobuf_qops;
! extern struct file_operations usbcam_v4l_fops_template;
  extern struct video_device usbcam_videodev_template;
  
  #endif  /* !defined(__USBCAM_PRIV_H__) */
--- 199,205 ----
  }
  
  extern struct videobuf_queue_ops usbcam_videobuf_qops;
! extern struct v4l2_file_operations usbcam_v4l_fops_template;
  extern struct video_device usbcam_videodev_template;
  
  #endif  /* !defined(__USBCAM_PRIV_H__) */
Only in r5u870_patched_patched/usbcam: usbcam_priv.h~
Only in r5u870_patched_patched/usbcam: usbcam_util.o