rpms/kernel/devel config-generic, 1.238.6.37, 1.238.6.38 hdpvr-ir-enable.patch, 1.2.2.3, 1.2.2.4 kernel.spec, 1.1294.2.63, 1.1294.2.64
myoung
myoung at fedoraproject.org
Sat Sep 5 19:02:24 UTC 2009
- Previous message (by thread): rpms/kernel/devel drm-ddc-caching-bug.patch, NONE, 1.1.2.2 kernel.spec, 1.1294.2.62, 1.1294.2.63 lirc-2.6.31.patch, 1.2.2.2, 1.2.2.3 xen.pvops.patch, 1.1.2.39, 1.1.2.40 xen.pvops.post.patch, 1.1.2.25, 1.1.2.26 xen.pvops.pre.patch, 1.1.2.16, 1.1.2.17
- Next message (by thread): rpms/php-pear-DB-DataObject-FormBuilder/EL-5 .cvsignore, 1.4, 1.5 php-pear-DB-DataObject-FormBuilder.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: myoung
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8969
Modified Files:
Tag: private-myoung-dom0-branch
config-generic hdpvr-ir-enable.patch kernel.spec
Log Message:
missed a couple of file changes
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.37
retrieving revision 1.238.6.38
diff -u -p -r1.238.6.37 -r1.238.6.38
--- config-generic 3 Sep 2009 20:02:36 -0000 1.238.6.37
+++ config-generic 5 Sep 2009 19:02:23 -0000 1.238.6.38
@@ -2235,7 +2235,7 @@ CONFIG_DRM=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON_KMS=y
CONFIG_DRM_I810=m
CONFIG_DRM_I830=m
CONFIG_DRM_MGA=m
@@ -2244,9 +2244,9 @@ CONFIG_DRM_SAVAGE=m
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_VIA=m
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_NOUVEAU_KMS is not set
-# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_KMS=y
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I2C_CH7006=m
#
hdpvr-ir-enable.patch:
Makefile | 4 --
hdpvr-core.c | 12 ++------
hdpvr-i2c.c | 88 +++++++++++++++++++++++++++++++++++++++++------------------
hdpvr.h | 2 -
4 files changed, 68 insertions(+), 38 deletions(-)
Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.3 -r1.2.2.4
--- hdpvr-ir-enable.patch 3 Sep 2009 20:02:36 -0000 1.2.2.3
+++ hdpvr-ir-enable.patch 5 Sep 2009 19:02:24 -0000 1.2.2.4
@@ -1,10 +1,11 @@
From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
---
- drivers/media/video/hdpvr/Makefile | 4 +--
- drivers/media/video/hdpvr/hdpvr-core.c | 7 ++--
- drivers/media/video/hdpvr/hdpvr-i2c.c | 49 ++++++++++++++++++++++++++-----
- 3 files changed, 45 insertions(+), 15 deletions(-)
+ drivers/media/video/hdpvr/Makefile | 4 +-
+ drivers/media/video/hdpvr/hdpvr-core.c | 12 ++---
+ drivers/media/video/hdpvr/hdpvr-i2c.c | 88 ++++++++++++++++++++++---------
+ drivers/media/video/hdpvr/hdpvr.h | 2 +-
+ 4 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
index e0230fc..79ad2e1 100644
@@ -19,7 +20,7 @@ index e0230fc..79ad2e1 100644
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..9fa3d8d 100644
+index 188bd5a..d2bb4c2 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
@@ -34,30 +35,42 @@ index 188bd5a..9fa3d8d 100644
if (retval < 0) {
v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
goto error;
-@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+@@ -414,12 +413,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
mutex_unlock(&dev->io_mutex);
/* deregister I2C adapter */
-#ifdef CONFIG_I2C
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
mutex_lock(&dev->i2c_mutex);
- if (dev->i2c_adapter)
- i2c_del_adapter(dev->i2c_adapter);
+- 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 c4b5d15..bc33607 100644
+index c4b5d15..7cd977f 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -10,6 +10,8 @@
+@@ -10,6 +10,7 @@
*
*/
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+
#include <linux/i2c.h>
#include "hdpvr.h"
-@@ -22,7 +24,7 @@
- #define REQTYPE_I2C_WRITE_STATT 0xd0
+@@ -19,10 +20,13 @@
+
+ #define REQTYPE_I2C_READ 0xb1
+ #define REQTYPE_I2C_WRITE 0xb0
+-#define REQTYPE_I2C_WRITE_STATT 0xd0
++#define REQTYPE_I2C_WRITE_STAT 0xd0
++
++#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, unsigned char addr,
- char *data, int len)
@@ -65,7 +78,7 @@ index c4b5d15..bc33607 100644
{
int ret;
char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,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,
@@ -74,7 +87,7 @@ index c4b5d15..bc33607 100644
if (ret == len) {
memcpy(data, buf, len);
-@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +50,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
}
static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -83,7 +96,7 @@ index c4b5d15..bc33607 100644
{
int ret;
char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,17 +61,17 @@ 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,
@@ -92,7 +105,19 @@ index c4b5d15..bc33607 100644
if (ret < 0)
goto error;
-@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+
+ ret = usb_control_msg(dev->udev,
+ usb_rcvctrlpipe(dev->udev, 0),
+- REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
++ REQTYPE_I2C_WRITE_STAT, 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 +97,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
if (msgs[i].flags & I2C_M_RD)
retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -105,10 +130,25 @@ index c4b5d15..bc33607 100644
}
mutex_unlock(&dev->i2c_mutex);
-@@ -114,15 +116,39 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,32 +118,64 @@ static struct i2c_algorithm hdpvr_algo = {
.functionality = hdpvr_functionality,
};
++static struct i2c_adapter hdpvr_i2c_adap_template = {
++ .name = "Hauppauge HD PVR I2C",
++ .owner = THIS_MODULE,
++ .id = I2C_HW_B_HDPVR,
++ .algo = &hdpvr_algo,
++ .class = I2C_CLASS_TV_ANALOG,
++};
++
++#if 1
++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),
++};
++#endif
++
+static int hdpvr_activate_ir(struct hdpvr_device *dev)
+{
+ char buffer[8];
@@ -128,41 +168,60 @@ index c4b5d15..bc33607 100644
+ return 0;
+}
+
-+
int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
{
- struct i2c_adapter *i2c_adap;
-+ struct i2c_board_info info;
+- struct i2c_adapter *i2c_adap;
int retval = -ENOMEM;
-+ const unsigned short addr_list[] = { 0x54, I2C_CLIENT_END };
-
- i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
- if (i2c_adap == NULL)
- goto error;
+- 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;
-@@ -135,11 +161,18 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
++ memcpy(&dev->i2c_adapter, &hdpvr_i2c_adap_template,
++ sizeof(struct i2c_adapter));
- retval = i2c_add_adapter(i2c_adap);
+- 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->id = I2C_HW_B_HDPVR;
+- i2c_adap->owner = THIS_MODULE;
+- i2c_adap->dev.parent = &dev->udev->dev;
++ 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)
-+ if (!retval) {
- dev->i2c_adapter = i2c_adap;
+- dev->i2c_adapter = i2c_adap;
- else
-+ memset(&info, 0, sizeof(struct i2c_board_info));
-+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-+ i2c_new_probed_device(&dev->i2c_adapter, &info, addr_list);
-+
-+ } else {
- kfree(i2c_adap);
-+ }
+- kfree(i2c_adap);
++ if (retval)
++ goto error;
++
++#if 1
++ i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
++#endif
error:
return retval;
}
+
+#endif /* CONFIG_I2C */
+diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
+index 1edd875..173aefa 100644
+--- a/drivers/media/video/hdpvr/hdpvr.h
++++ b/drivers/media/video/hdpvr/hdpvr.h
+@@ -101,7 +101,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.1294.2.63
retrieving revision 1.1294.2.64
diff -u -p -r1.1294.2.63 -r1.1294.2.64
--- kernel.spec 5 Sep 2009 19:00:23 -0000 1.1294.2.63
+++ kernel.spec 5 Sep 2009 19:02:24 -0000 1.1294.2.64
@@ -2039,7 +2039,7 @@ fi
* Sat Sep 04 2009 Michael Young <m.a.young at durham.ac.uk>
- update pvops which includes swiotlb updates and a network fix
- try a drm build fix
-- re-enable CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS options
+- therefore re-enable CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS options
* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.203.rc8.git2
- Fix kernel build errors when building firmware by removing the
- Previous message (by thread): rpms/kernel/devel drm-ddc-caching-bug.patch, NONE, 1.1.2.2 kernel.spec, 1.1294.2.62, 1.1294.2.63 lirc-2.6.31.patch, 1.2.2.2, 1.2.2.3 xen.pvops.patch, 1.1.2.39, 1.1.2.40 xen.pvops.post.patch, 1.1.2.25, 1.1.2.26 xen.pvops.pre.patch, 1.1.2.16, 1.1.2.17
- Next message (by thread): rpms/php-pear-DB-DataObject-FormBuilder/EL-5 .cvsignore, 1.4, 1.5 php-pear-DB-DataObject-FormBuilder.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list