rpms/kernel/F-13 lirc-2.6.33.patch,1.2,1.3

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	lirc-2.6.33.patch 
Log Message:
permit imon driver to pass keyboard toggle button value through when mouse mode is disabled

lirc-2.6.33.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  116 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  749 ++++++++++
 drivers/input/lirc/lirc_dev.h         |  228 +++
 drivers/input/lirc/lirc_ene0100.c     |  646 ++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  536 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  555 +++++++
 drivers/input/lirc/lirc_imon.c        | 1053 ++++++++++++++
 drivers/input/lirc/lirc_it87.c        | 1019 +++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  540 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 ++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1317 +++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 +++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  821 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1388 ++++++++++++++++++
 drivers/input/misc/Kconfig            |   12 
 drivers/input/misc/Makefile           |    1 
 drivers/input/misc/imon.c             | 2501 ++++++++++++++++++++++++++++++++++
 include/linux/lirc.h                  |  159 ++
 29 files changed, 16914 insertions(+)

Index: lirc-2.6.33.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/lirc-2.6.33.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc-2.6.33.patch	17 Mar 2010 14:10:29 -0000	1.2
+++ lirc-2.6.33.patch	17 Mar 2010 14:32:03 -0000	1.3
@@ -14477,7 +14477,7 @@ index 7e95a5d..8918ce7 100644
  obj-$(CONFIG_INPUT_M68K_BEEP)		+= m68kspkr.o
 diff --git a/drivers/input/misc/imon.c b/drivers/input/misc/imon.c
 new file mode 100644
-index 0000000..dfe584f
+index 0000000..0c05f95
 --- /dev/null
 +++ b/drivers/input/misc/imon.c
 @@ -0,0 +1,2501 @@
@@ -16135,16 +16135,16 @@ index 0000000..dfe584f
 +
 +	/* keyboard/mouse mode toggle button */
 +	if (kc == KEY_KEYBOARD && ki < offset) {
++		ictx->last_keycode = kc;
 +		if (!nomouse) {
 +			ictx->pad_mouse = ~(ictx->pad_mouse) & 0x1;
 +			dev_dbg(dev, "toggling to %s mode\n",
 +				ictx->pad_mouse ? "mouse" : "keyboard");
++			return;
 +		} else {
 +			ictx->pad_mouse = 0;
-+			dev_dbg(dev, "mouse mode was disabled by modparam\n");
++			dev_dbg(dev, "mouse mode disabled, passing key value\n");
 +		}
-+		ictx->last_keycode = kc;
-+		return;
 +	}
 +
 +	ictx->ki = ki;