rpms/kernel/F-11 kernel.spec, 1.1659, 1.1660 linux-2.6.29-lirc.patch, 1.8, 1.9

Jarod Wilson jwilson at fedoraproject.org
Thu Jun 25 02:11:03 UTC 2009


Author: jwilson

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

Modified Files:
	kernel.spec linux-2.6.29-lirc.patch 
Log Message:
* Wed Jun 24 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.5-198
- Fix lirc_i2c functionality (#507047)
- Add ability to disable lirc_imon mouse mode



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1659
retrieving revision 1.1660
diff -u -p -r1.1659 -r1.1660
--- kernel.spec	24 Jun 2009 20:26:09 -0000	1.1659
+++ kernel.spec	25 Jun 2009 02:10:33 -0000	1.1660
@@ -2073,6 +2073,10 @@ fi
 # and build.
 
 %changelog
+* Wed Jun 24 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.5-198
+- Fix lirc_i2c functionality (#507047)
+- Add ability to disable lirc_imon mouse mode
+
 * Wed Jun 24 2009 Kyle McMartin <kyle at redhat.com>
 - config changes:
  - generic:

linux-2.6.29-lirc.patch:

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-lirc.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- linux-2.6.29-lirc.patch	18 Jun 2009 04:21:26 -0000	1.8
+++ linux-2.6.29-lirc.patch	25 Jun 2009 02:10:33 -0000	1.9
@@ -2,6 +2,8 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
+Refreshed 20090624
+
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
@@ -12,16 +14,16 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/Makefile           |   21 +
  drivers/input/lirc/lirc.h             |  100 ++
  drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  849 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  850 ++++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
  drivers/input/lirc/lirc_i2c.c         |  649 +++++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
- drivers/input/lirc/lirc_imon.c        | 2043 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2057 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 +++++++++
  drivers/input/lirc/lirc_mceusb.c      |  749 ++++++++++++
- drivers/input/lirc/lirc_mceusb2.c     | 1103 ++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb2.c     | 1105 ++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
  drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++++
@@ -30,7 +32,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
  drivers/input/lirc/lirc_zilog.c       | 1384 ++++++++++++++++++++++
- 25 files changed, 15243 insertions(+), 0 deletions(-)
+ 25 files changed, 15260 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 59fd2d1..ad1b16c 100644
@@ -723,10 +725,10 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..8848d8e
+index 0000000..9d1630e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,849 @@
+@@ -0,0 +1,850 @@
 +/*
 + * LIRC base driver
 + *
@@ -914,7 +916,7 @@ index 0000000..8848d8e
 +		cdev_init(&ir->cdev, &fops);
 +		ir->cdev.owner = THIS_MODULE;
 +	}
-+	kobject_set_name(&ir->cdev.kobj, "lircv%d", d->minor);
++	kobject_set_name(&ir->cdev.kobj, "lirc%d", d->minor);
 +
 +	retval = cdev_add(&ir->cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
 +	if (retval)
@@ -1035,7 +1037,8 @@ index 0000000..8848d8e
 +	/* some safety check 8-) */
 +	d->name[sizeof(d->name)-1] = '\0';
 +
-+	bytes_in_key = BITS_TO_LONGS(d->code_length);
++	bytes_in_key = BITS_TO_LONGS(d->code_length) +
++			(d->code_length % 8 ? 1 : 0);
 +	buffer_size = d->buffer_size ? d->buffer_size : BUFLEN / bytes_in_key;
 +	chunk_size  = d->chunk_size  ? d->chunk_size  : bytes_in_key;
 +
@@ -2985,10 +2988,10 @@ index 0000000..ff49bdd
 +
 diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
 new file mode 100644
-index 0000000..bcd8d42
+index 0000000..5375d6f
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2043 @@
+@@ -0,0 +1,2057 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -3353,6 +3356,12 @@ index 0000000..bcd8d42
 +/* IR protocol: native iMON or Windows MCE (RC-6) */
 +static int ir_protocol;
 +
++/*
++ * In certain use cases, mouse mode isn't really helpful, and could actually
++ * cause confusion, so allow disabling it when the IR device is open.
++ */
++static int nomouse;
++
 +
 +/***  M O D U L E   C O D E ***/
 +
@@ -3369,6 +3378,9 @@ index 0000000..bcd8d42
 +module_param(ir_protocol, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(ir_protocol, "Which IR protocol to use. 0=native iMON, "
 +		 "1=Windows Media Center Ed. (RC-6) (default: native iMON)");
++module_param(nomouse, int, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(nomouse, "Disable mouse input device mode when IR device is "
++		 "open. 0=don't disable, 1=disable. (default: don't disable)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -4098,9 +4110,14 @@ index 0000000..bcd8d42
 +	/* keyboard/mouse mode toggle button */
 +	if (memcmp(buf, toggle_button1, 4) == 0 ||
 +	    memcmp(buf, toggle_button2, 4) == 0) {
-+		context->pad_mouse = ~(context->pad_mouse) & 0x1;
-+		dprintk("toggling to %s mode\n",
-+			context->pad_mouse ? "mouse" : "keyboard");
++		if (!nomouse) {
++			context->pad_mouse = ~(context->pad_mouse) & 0x1;
++			dprintk("toggling to %s mode\n",
++				context->pad_mouse ? "mouse" : "keyboard");
++		} else {
++			context->pad_mouse = 0;
++			dprintk("mouse mode was disabled by modparam\n");
++		}
 +		return;
 +	}
 +
@@ -7448,10 +7465,10 @@ index 0000000..12d9723
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
 new file mode 100644
-index 0000000..36ef032
+index 0000000..897226d
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb2.c
-@@ -0,0 +1,1103 @@
+@@ -0,0 +1,1105 @@
 +/*
 + * LIRC driver for Philips eHome USB Infrared Transceiver
 + * and the Microsoft Media Center Edition Remote Control
@@ -7634,8 +7651,10 @@ index 0000000..36ef032
 +	{ USB_DEVICE(VENDOR_WISTRON, 0x0002) },
 +	/* Compro K100 */
 +	{ USB_DEVICE(VENDOR_COMPRO, 0x3020) },
++	/* Compro K100 v2 */
++	{ USB_DEVICE(VENDOR_COMPRO, 0x3082) },
 +	/* Northstar Systems, Inc. eHome Infrared Transceiver */
-+	{ USB_DEVICE(VENDOR_NORTHSTAR, 0xe0004) },
++	{ USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) },
 +	/* Terminating entry */
 +	{ }
 +};




More information about the fedora-extras-commits mailing list