rpms/kernel/devel hdpvr-ir-enable.patch, 1.6, 1.7 kernel.spec, 1.2026, 1.2027

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16262

Modified Files:
	hdpvr-ir-enable.patch kernel.spec 
Log Message:
* Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-36
- remunge and reapply hdpvr-ir-enable


hdpvr-ir-enable.patch:
 hdpvr-core.c |   12 ++------
 hdpvr-i2c.c  |   79 ++++++++++++++++++++++++++++++++++++++++-------------------
 hdpvr.h      |    2 -
 3 files changed, 59 insertions(+), 34 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hdpvr-ir-enable.patch	28 Sep 2009 05:09:48 -0000	1.6
+++ hdpvr-ir-enable.patch	13 Jun 2010 17:12:13 -0000	1.7
@@ -0,0 +1,194 @@
+From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
+
+---
+ drivers/media/video/hdpvr/hdpvr-core.c |   12 ++---
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   79 ++++++++++++++++++++++----------
+ drivers/media/video/hdpvr/hdpvr.h      |    2 +-
+ 3 files changed, 59 insertions(+), 34 deletions(-)
+
+diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
+index 2fc9865..c72793a 100644
+--- a/drivers/media/video/hdpvr/hdpvr-core.c
++++ b/drivers/media/video/hdpvr/hdpvr-core.c
+@@ -364,9 +364,8 @@ static int hdpvr_probe(struct usb_interface *interface,
+ 		goto error;
+ 	}
+ 
+-#ifdef CONFIG_I2C
+-	/* until i2c is working properly */
+-	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
++	retval = hdpvr_register_i2c_adapter(dev);
+ 	if (retval < 0) {
+ 		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
+ 		goto error;
+@@ -412,12 +411,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+ 	mutex_unlock(&dev->io_mutex);
+ 
+ 	/* deregister I2C adapter */
+-#ifdef CONFIG_I2C
++#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
+ 	mutex_lock(&dev->i2c_mutex);
+-	if (dev->i2c_adapter)
+-		i2c_del_adapter(dev->i2c_adapter);
+-	kfree(dev->i2c_adapter);
+-	dev->i2c_adapter = NULL;
++	i2c_del_adapter(&dev->i2c_adapter);
+ 	mutex_unlock(&dev->i2c_mutex);
+ #endif /* CONFIG_I2C */
+ 
+diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
+index 463b81b..ae26237 100644
+--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
++++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
+@@ -22,8 +22,11 @@
+ #define REQTYPE_I2C_WRITE	0xb0
+ #define REQTYPE_I2C_WRITE_STATT	0xd0
+ 
+-static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+-			  char *data, int len)
++#define HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR	0x70
++#define HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR	0x71
++
++static int hdpvr_i2c_read(struct hdpvr_device *dev, int bus,
++			  unsigned char addr, char *data, int len)
+ {
+ 	int ret;
+ 	char *buf = kmalloc(len, GFP_KERNEL);
+@@ -33,7 +36,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_rcvctrlpipe(dev->udev, 0),
+ 			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
+-			      0x100|addr, 0, buf, len, 1000);
++			      (bus << 8) | addr, 0, buf, len, 1000);
+ 
+ 	if (ret == len) {
+ 		memcpy(data, buf, len);
+@@ -46,8 +49,8 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+ 	return ret;
+ }
+ 
+-static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+-			   char *data, int len)
++static int hdpvr_i2c_write(struct hdpvr_device *dev, int bus,
++			   unsigned char addr, char *data, int len)
+ {
+ 	int ret;
+ 	char *buf = kmalloc(len, GFP_KERNEL);
+@@ -58,7 +61,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_sndctrlpipe(dev->udev, 0),
+ 			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
+-			      0x100|addr, 0, buf, len, 1000);
++			      (bus << 8) | addr, 0, buf, len, 1000);
+ 
+ 	if (ret < 0)
+ 		goto error;
+@@ -68,7 +71,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+ 			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
+ 			      0, 0, buf, 2, 1000);
+ 
+-	if (ret == 2)
++	if ((ret == 2) && (buf[1] == (len - 1)))
+ 		ret = 0;
+ 	else if (ret >= 0)
+ 		ret = -EIO;
+@@ -93,10 +96,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+ 		addr = msgs[i].addr << 1;
+ 
+ 		if (msgs[i].flags & I2C_M_RD)
+-			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
++			retval = hdpvr_i2c_read(dev, 1, addr, msgs[i].buf,
+ 						msgs[i].len);
+ 		else
+-			retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
++			retval = hdpvr_i2c_write(dev, 1, addr, msgs[i].buf,
+ 						 msgs[i].len);
+ 	}
+ 
+@@ -115,30 +118,56 @@ static struct i2c_algorithm hdpvr_algo = {
+ 	.functionality = hdpvr_functionality,
+ };
+ 
++static struct i2c_adapter hdpvr_i2c_adapter_template = {
++	.name 	= "Hauppage HD PVR I2C",
++	.owner 	= THIS_MODULE,
++	.id 	= I2C_HW_B_HDPVR,
++	.algo 	= &hdpvr_algo,
++	.class 	= I2C_CLASS_TV_ANALOG,
++};
++
++static struct i2c_board_info hdpvr_i2c_board_info = {
++	I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
++	I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
++};
++
++static int hdpvr_activate_ir(struct hdpvr_device *dev)
++{
++	char buffer[8];
++
++	mutex_lock(&dev->i2c_mutex);
++
++	hdpvr_i2c_read(dev, 0, 0x54, buffer, 1);
++
++	buffer[0] = 0;
++	buffer[1] = 0x8;
++	hdpvr_i2c_write(dev, 1, 0x54, buffer, 2);
++
++	buffer[1] = 0x18;
++	hdpvr_i2c_write(dev, 1, 0x54, buffer, 2);
++
++	mutex_unlock(&dev->i2c_mutex);
++
++	return 0;
++}
++
+ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ {
+-	struct i2c_adapter *i2c_adap;
+ 	int retval = -ENOMEM;
+ 
+-	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
+-	if (i2c_adap == NULL)
+-		goto error;
++	hdpvr_activate_ir(dev);
+ 
+-	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
+-		sizeof(i2c_adap->name));
+-	i2c_adap->algo  = &hdpvr_algo;
+-	i2c_adap->class = I2C_CLASS_TV_ANALOG;
+-	i2c_adap->owner = THIS_MODULE;
+-	i2c_adap->dev.parent = &dev->udev->dev;
++	memcpy(&dev->i2c_adapter, &hdpvr_i2c_adapter_template,
++		sizeof(struct i2c_adapter));
++	dev->i2c_adapter.dev.parent = &dev->udev->dev;
+ 
+-	i2c_set_adapdata(i2c_adap, dev);
++	i2c_set_adapdata(&dev->i2c_adapter, dev);
+ 
+-	retval = i2c_add_adapter(i2c_adap);
++	retval = i2c_add_adapter(&dev->i2c_adapter);
++	if (retval)
++		goto error;
+ 
+-	if (!retval)
+-		dev->i2c_adapter = i2c_adap;
+-	else
+-		kfree(i2c_adap);
++	i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
+ 
+ error:
+ 	return retval;
+diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
+index 49ae25d..8a5729a 100644
+--- a/drivers/media/video/hdpvr/hdpvr.h
++++ b/drivers/media/video/hdpvr/hdpvr.h
+@@ -102,7 +102,7 @@ struct hdpvr_device {
+ 	struct work_struct	worker;
+ 
+ 	/* I2C adapter */
+-	struct i2c_adapter	*i2c_adapter;
++	struct i2c_adapter	i2c_adapter;
+ 	/* I2C lock */
+ 	struct mutex		i2c_mutex;
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -p -r1.2026 -r1.2027
--- kernel.spec	13 Jun 2010 12:13:08 -0000	1.2026
+++ kernel.spec	13 Jun 2010 17:12:13 -0000	1.2027
@@ -1985,6 +1985,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-36
+- remunge and reapply hdpvr-ir-enable
+
 * Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-35
 - mac80211/iwlwifi fix connections to some APs (rhbz#558002)
   patches from sgruszka at .