rpms/kernel/F-10 kernel.spec, 1.1206.2.41, 1.1206.2.42 linux-2.6-hdpvr.patch, 1.1, 1.1.12.1

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23657

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec linux-2.6-hdpvr.patch 
Log Message:
* Sat Mar 07 2009 Jarod Wilson <jarod at redhat.com> 2.6.27.19-170.2.42
- hdpvr: add addtional device IDs and permit functioning w/latest firmwares



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.41
retrieving revision 1.1206.2.42
diff -u -r1.1206.2.41 -r1.1206.2.42
--- kernel.spec	6 Mar 2009 04:15:58 -0000	1.1206.2.41
+++ kernel.spec	8 Mar 2009 03:30:09 -0000	1.1206.2.42
@@ -1987,6 +1987,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Mar 07 2009 Jarod Wilson <jarod at redhat.com> 2.6.27.19-170.2.42
+- hdpvr: add addtional device IDs and permit functioning w/latest firmwares
+
 * Thu Mar 05 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.19-170.2.41
 - Add ext4 stable patch queue.
 - Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch.

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- linux-2.6-hdpvr.patch	6 Oct 2008 17:11:35 -0000	1.1
+++ linux-2.6-hdpvr.patch	8 Mar 2009 03:30:10 -0000	1.1.12.1
@@ -290,7 +290,7 @@
 index 0000000..19e5282
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -0,0 +1,455 @@
+@@ -0,0 +1,461 @@
 +/*
 + * Hauppage HD PVR USB driver
 + *
@@ -350,6 +350,8 @@
 +/* table of devices that work with this driver */
 +static struct usb_device_id hdpvr_table [] = {
 +	{ USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID) },
++	{ USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) },
++	{ USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) },
 +	{ }					/* Terminating entry */
 +};
 +MODULE_DEVICE_TABLE(usb, hdpvr_table);
@@ -466,6 +468,10 @@
 +		dev->flags &= ~HDPVR_FLAG_AC3_CAP;
 +	} else if (buf[1] == HDPVR_FIRMWARE_VERSION_AC3) {
 +		dev->flags |= HDPVR_FLAG_AC3_CAP;
++	} else if (buf[1] > HDPVR_FIRMWARE_VERSION_AC3) {
++		hdpvr_print("untested firmware version 0x%x, the driver might "
++			    "not work", buf[1]);
++		dev->flags |= HDPVR_FLAG_AC3_CAP;
 +	} else {
 +		hdpvr_err("unknown firmware version 0x%x", buf[1]);
 +		ret = -EINVAL;
@@ -902,7 +908,7 @@
 index 0000000..2378099
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr-video.c
-@@ -0,0 +1,1258 @@
+@@ -0,0 +1,1261 @@
 +/*
 + * Hauppage HD PVR USB driver - video 4 linux 2 interface
 + *
@@ -1529,8 +1535,11 @@
 +static int vidioc_querycap(struct file *file, void  *priv,
 +			   struct v4l2_capability *cap)
 +{
++	struct hdpvr_device *dev = video_drvdata(file);
++
 +	strcpy(cap->driver, "hdpvr");
-+	strcpy(cap->card, "Haupauge HD PVR");
++	strcpy(cap->card, "Hauppauge HD PVR");
++	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
 +	cap->version = HDPVR_VERSION;
 +	cap->capabilities =     V4L2_CAP_VIDEO_CAPTURE |
 +				V4L2_CAP_AUDIO         |
@@ -2166,7 +2175,7 @@
 index 0000000..ffe3a36
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr.h
-@@ -0,0 +1,324 @@
+@@ -0,0 +1,326 @@
 +/*
 + * Hauppage HD PVR USB driver
 + *
@@ -2194,6 +2203,8 @@
 +/* Define these values to match your devices */
 +#define HD_PVR_VENDOR_ID	0x2040
 +#define HD_PVR_PRODUCT_ID	0x4900
++#define HD_PVR_PRODUCT_ID1	0x4901
++#define HD_PVR_PRODUCT_ID2	0x4902
 +
 +#define UNSET    (-1U)
 +