rpms/kernel/devel config-generic, 1.163, 1.164 kernel.spec, 1.920, 1.921 linux-2.6-lirc.patch, 1.9, 1.10

Tue Sep 2 22:27:48 UTC 2008

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12107

Modified Files:
	config-generic kernel.spec linux-2.6-lirc.patch 
Log Message:
* Tue Sep 02 2008 Jarod Wilson <jarod at redhat.com>
- Rename lirc_pvr150 to more appropriate lirc_zilog



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164

--- config-generic	26 Aug 2008 15:28:38 -0000	1.163
+++ config-generic	2 Sep 2008 22:27:17 -0000	1.164
@@ -3580,7 +3580,7 @@
 CONFIG_LIRC_IT87=m
 CONFIG_LIRC_MCEUSB=m
 CONFIG_LIRC_MCEUSB2=m
-CONFIG_LIRC_PVR150=m
+CONFIG_LIRC_ZILOG=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SIR=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- kernel.spec	2 Sep 2008 14:56:52 -0000	1.920
+++ kernel.spec	2 Sep 2008 22:27:17 -0000	1.921
@@ -1750,6 +1750,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 02 2008 Jarod Wilson <jarod at redhat.com>
+- Rename lirc_pvr150 to more appropriate lirc_zilog
+
 * Tue Sep 02 2008 Kyle McMartin <kyle at redhat.com>
 - hopefully fix the iwlwifi issues.
 - add an include <linux/pagemap.h> to drm-nouveau to hopefully fix

linux-2.6-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 linux-2.6-lirc.patch
Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-lirc.patch	4 Aug 2008 15:19:01 -0000	1.9
+++ linux-2.6-lirc.patch	2 Sep 2008 22:27:18 -0000	1.10
@@ -1,6 +1,6 @@
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  127 +++
+ drivers/input/lirc/Kconfig            |  128 +++
  drivers/input/lirc/Makefile           |   24 +
  drivers/input/lirc/commandir.c        | 1009 +++++++++++++++++++++++
  drivers/input/lirc/commandir.h        |   41 +
@@ -13,21 +13,21 @@
  drivers/input/lirc/lirc_dev.c         |  827 +++++++++++++++++++
  drivers/input/lirc/lirc_dev.h         |  264 ++++++
  drivers/input/lirc/lirc_i2c.c         |  668 +++++++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  624 ++++++++++++++
- drivers/input/lirc/lirc_imon.c        | 1248 ++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  624 +++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 1248 +++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1012 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
  drivers/input/lirc/lirc_mceusb.c      |  890 ++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1060 ++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  745 +++++++++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
- drivers/input/lirc/lirc_pvr150.c      | 1431 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_sasem.c       |  971 ++++++++++++++++++++++
  drivers/input/lirc/lirc_serial.c      | 1348 +++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_sir.c         | 1323 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_streamzap.c   |  810 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  393 +++++++++
- 29 files changed, 17566 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_zilog.c       | 1425 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17561 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -53,10 +53,10 @@
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..138e58a
+index 0000000..62cfbf7
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,128 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -141,12 +141,13 @@
 +	help
 +	  Driver for the Microsoft Media Center Ed. Receiver, v2
 +
-+config LIRC_PVR150
-+	tristate "Hauppauge PVR-XXX Transmitter"
++config LIRC_ZILOG
++	tristate "Zilog/Hauppauge IR Transmitter"
 +	default m
 +	depends on LIRC_DEV
 +	help
-+	  Driver for the Hauppauge PVR-150/250/350/500 IR Transmitter
++	  Driver for the Zilog/Hauppauge IR Transmitter, found on
++	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
 +
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
@@ -186,7 +187,7 @@
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..71124ef
+index 0000000..d22dc5b
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
 @@ -0,0 +1,24 @@
@@ -207,7 +208,7 @@
 +obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
 +obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
-+obj-$(CONFIG_LIRC_PVR150)	+= lirc_pvr150.o
++obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
 +obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 +obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 +obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
@@ -11463,34 +11464,53 @@
 +#define LIRC_PARALLEL_TRANSMITTER_MASK ((1<<LIRC_PARALLEL_MAX_TRANSMITTERS) - 1)
 +
 +#endif
-diff --git a/drivers/input/lirc/lirc_pvr150.c b/drivers/input/lirc/lirc_pvr150.c
+diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
 new file mode 100644
-index 0000000..fed5720
+index 0000000..0d3e55f
 --- /dev/null
-+++ b/drivers/input/lirc/lirc_pvr150.c
-@@ -0,0 +1,1431 @@
++++ b/drivers/input/lirc/lirc_sasem.c
+@@ -0,0 +1,971 @@
 +/*      $Id$      */
 +
-+/*
-+ * i2c IR lirc plugin for Hauppauge PVR 150 card
++/* lirc_sasem.c - USB remote support for LIRC
++ * Version 0.5
 + *
-+ * Copyright (c) 2000 Gerd Knorr <kraxel at goldbach.in-berlin.de>
-+ * modified for PixelView (BT878P+W/FM) by
-+ *      Michal Kochanowicz <mkochano at pld.org.pl>
-+ *      Christoph Bartelmus <lirc at bartelmus.de>
-+ * modified for KNC ONE TV Station/Anubis Typhoon TView Tuner by
-+ *      Ulrich Mueller <ulrich.mueller42 at web.de>
-+ * modified for Asus TV-Box and Creative/VisionTek BreakOut-Box by
-+ *      Stefan Jahn <stefan at lkcc.org>
-+ * modified for inclusion into kernel sources by
-+ *      Jerome Brock <jbrock at users.sourceforge.net>
-+ * modified for Leadtek Winfast PVR2000 by
-+ *      Thomas Reitmayr (treitmayr at yahoo.com)
-+ * modified for Hauppauge PVR-150 IR TX device by
-+ *      Mark Weaver <mark at npsl.co.uk>
++ * Copyright (C) 2004-2005 Oliver Stabel <oliver.stabel at gmx.de>
++ *			 Tim Davies <tim at opensystems.net.au>
 + *
-+ * parts are cut&pasted from the lirc_i2c.c driver
++ * This driver was derived from:
++ *   Venky Raju <dev at venky.ws>
++ *      "lirc_imon - "LIRC plugin/VFD driver for Ahanix/Soundgraph IMON IR/VFD"
++ *   Paul Miller <pmiller9 at users.sourceforge.net>'s 2003-2004
++ *      "lirc_atiusb - USB remote support for LIRC"
++ *   Culver Consulting Services <henry at culcon.com>'s 2003
++ *      "Sasem OnAir VFD/IR USB driver"
 + *
++ *
++ * 2004/06/13   -   0.1
++ *		  initial version
++ *
++ * 2004/06/28   -   0.2
++ *		  added file system support to write data to VFD device (used
++ *		  in conjunction with LCDProc)
++ *
++ * 2004/11/22   -   0.3
++ *		  Ported to 2.6 kernel
++ *		  	- Tim Davies <tim at opensystems.net.au>
++ *
++ * 2005/03/29   -   0.4
++ *		  A few tidyups and keypress timings
++ *		  	- Tim Davies <tim at opensystems.net.au>
++ *
++ * 2005/06/23   -   0.5
++ *		  A complete rewrite (shamelessly) based on lirc_imon.c
++ *		  Tim Davies <tim at opensystems.net.au>
++ *
++ * NOTE - The LCDproc iMon driver should work with this module.  More info at
++ *	http://www.frogstorm.info/sasem
++ */
++
++/*
 + *  This program is free software; you can redistribute it and/or modify
 + *  it under the terms of the GNU General Public License as published by
 + *  the Free Software Foundation; either version 2 of the License, or
@@ -11504,2399 +11524,2289 @@
 + *  You should have received a copy of the GNU General Public License
 + *  along with this program; if not, write to the Free Software
 + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
 + */
 +
++#include <linux/version.h>
 +
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
 +
-+#include <linux/version.h>
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/fs.h>
-+#include <linux/poll.h>
-+#include <linux/string.h>
-+#include <linux/timer.h>
-+#include <linux/delay.h>
-+#include <linux/completion.h>
++#include <linux/autoconf.h>
++
 +#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
 +#include <linux/slab.h>
-+#include <linux/i2c.h>
-+#include <linux/i2c-algo-bit.h>
-+#include <linux/firmware.h>
-+#include <linux/vmalloc.h>
[...11067 lines suppressed...]
-+	ttusbir->plugin.owner = THIS_MODULE;
-+	ttusbir->plugin.features = LIRC_CAN_REC_MODE2;
-+	ttusbir->minor = lirc_register_plugin(&ttusbir->plugin);
-+	if (ttusbir->minor < 0) {
-+		err("Error registering as LIRC plugin\n");
-+		usb_set_intfdata(intf, NULL);
-+		lirc_buffer_free(&ttusbir->rbuf);
-+		kfree(ttusbir);
-+		return -EIO;
++		/* unregister device */
++		i2c_detach_client(&ir->c_rx);
++	} else if (client == &ir->c_tx) {
++		i2c_detach_client(&ir->c_tx);
++	} else {
++		up(&ir->lock);
++		zilog_error("ir_detach: detached from something we didn't "
++			    "attach to\n");
++		return -ENODEV;
 +	}
 +
-+	/* Allocate and setup the URB that we will use to talk to the device */
-+	for (i = 0; i < num_urbs; i++) {
-+		ttusbir->urb[i] = usb_alloc_urb(8, GFP_KERNEL);
-+		if (!ttusbir->urb[i]) {
-+			err("Could not allocate memory for the URB\n");
-+			for (j = i - 1; j >= 0; j--)
-+				kfree(ttusbir->urb[j]);
-+			lirc_buffer_free(&ttusbir->rbuf);
-+			lirc_unregister_plugin(ttusbir->minor);
-+			kfree(ttusbir);
-+			usb_set_intfdata(intf, NULL);
-+			return -ENOMEM;
-+		}
-+		ttusbir->urb[i]->dev = ttusbir->udev;
-+		ttusbir->urb[i]->context = ttusbir;
-+		ttusbir->urb[i]->pipe = usb_rcvisocpipe(ttusbir->udev,
-+							ttusbir->endpoint);
-+		ttusbir->urb[i]->interval = 1;
-+		ttusbir->urb[i]->transfer_flags = URB_ISO_ASAP;
-+		ttusbir->urb[i]->transfer_buffer = &ttusbir->buffer[i][0];
-+		ttusbir->urb[i]->complete = urb_complete;
-+		ttusbir->urb[i]->number_of_packets = 8;
-+		ttusbir->urb[i]->transfer_buffer_length = 128;
-+		for (j = 0; j < 8; j++) {
-+			ttusbir->urb[i]->iso_frame_desc[j].offset = j*16;
-+			ttusbir->urb[i]->iso_frame_desc[j].length = 16;
++	--ir->devs;
++	if (ir->devs < 0) {
++		up(&ir->lock);
++		zilog_error("ir_detach: invalid device count\n");
++		return -ENODEV;
++	} else if (ir->devs == 0) {
++		/* unregister lirc plugin */
++		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
++			lirc_unregister_plugin(ir->l.minor);
++			ir_devices[ir->l.minor] = NULL;
 +		}
++
++		/* free memory */
++		lirc_buffer_free(&ir->buf);
++		up(&ir->lock);
++		kfree(ir);
++		return 0;
 +	}
++	up(&ir->lock);
 +	return 0;
 +}
 +
-+/* Called when the driver is unloaded or the device is unplugged
-+ */
-+static void disconnect(struct usb_interface *intf)
++static int ir_probe(struct i2c_adapter *adap)
 +{
-+	int i;
-+	struct ttusbir_device *ttusbir;
++	struct i2c_client c;
++	char buf;
 +
-+	DPRINTK("Module ttusbir disconnect\n");
++#ifdef I2C_HW_B_CX2341X
++	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
++		adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
++#else
++	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
++#endif
++	{
++		int have_rx = 0, have_tx = 0;
 +
-+	ttusbir = (struct ttusbir_device *) usb_get_intfdata(intf);
-+	usb_set_intfdata(intf, NULL);
-+	lirc_unregister_plugin(ttusbir->minor);
-+	DPRINTK("unregistered\n");
++		/* The external IR receiver is at
++		 * i2c address 0x71 on the PVR-150.
++		 * The IR transmitter is at 0x70. */
++		memset(&c, 0, sizeof(c));
++		c.adapter = adap;
++		c.addr = 0x70;
 +
-+	for (i = 0; i < num_urbs; i++) {
-+		usb_kill_urb(ttusbir->urb[i]);
-+		usb_free_urb(ttusbir->urb[i]);
++		if (!disable_rx) {
++			if (i2c_master_recv(&c, &buf, 1) == 1)
++				have_rx = 1;
++			dprintk("probe 0x70 @ %s: %s\n",
++				adap->name,
++				have_rx ? "yes" : "no");
++		}
++
++		if (!disable_tx) {
++			c.addr = 0x71;
++			if (i2c_master_recv(&c, &buf, 1) == 1)
++				have_tx = 1;
++			dprintk("probe 0x71 @ %s: %s\n",
++				adap->name,
++				have_tx ? "yes" : "no");
++		}
++
++		if (have_rx || have_tx)
++			return ir_attach(adap, have_rx, have_tx);
++		else
++			zilog_error("%s: no devices found\n", adap->name);
 +	}
-+	DPRINTK("URBs killed\n");
-+	lirc_buffer_free(&ttusbir->rbuf);
-+	kfree(ttusbir);
++
++	return 0;
 +}
 +
-+static int ttusbir_init_module(void)
++static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
 +{
-+	int result;
++	/* nothing */
++	return 0;
++}
 +
-+	DPRINTK(KERN_DEBUG "Module ttusbir init\n");
++/* ----------------------------------------------------------------------- */
++#ifdef MODULE
 +
-+	/* register this driver with the USB subsystem */
-+	result = usb_register(&driver);
-+	if (result)
-+		err("usb_register failed. Error number %d", result);
-+	return result;
++int init_module(void)
++{
++	init_MUTEX(&tx_data_lock);
++	request_module("ivtv");
++	request_module("firmware_class");
++	i2c_add_driver(&driver);
++	return 0;
 +}
 +
-+static void ttusbir_exit_module(void)
++void cleanup_module(void)
 +{
-+	printk(KERN_DEBUG "Module ttusbir exit\n");
-+	/* deregister this driver with the USB subsystem */
-+	usb_deregister(&driver);
++	i2c_del_driver(&driver);
++	/* if loaded */
++	fw_unload();
 +}
 +
-+module_init(ttusbir_init_module);
-+module_exit(ttusbir_exit_module);
++MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
++MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
++	      "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
++MODULE_LICENSE("GPL");
++/* for compat with old name, which isn't all that accurate anymore */
++MODULE_ALIAS("lirc_pvr150");
++
++module_param(minor, int, 0444);
++MODULE_PARM_DESC(minor, "Preferred minor device number");
++
++module_param(debug, bool, 0644);
++MODULE_PARM_DESC(debug, "Enable debugging messages");
++
++module_param(disable_rx, bool, 0644);
++MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
++
++module_param(disable_tx, bool, 0644);
++MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
++
++EXPORT_NO_SYMBOLS;
++
++#endif /* MODULE */
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */


