rpms/kernel/F-12 config-generic, 1.331, 1.332 kernel.spec, 1.1938, 1.1939 lirc-2.6.31.patch, 1.4, 1.5
Jarod Wilson
jwilson at fedoraproject.org
Sat Nov 28 06:55:17 UTC 2009
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18103
Modified Files:
config-generic kernel.spec lirc-2.6.31.patch
Log Message:
* Fri Nov 27 2009 Jarod Wilson <jarod at redhat.com> 2.6.31.6-153
- add device name to lirc_zilog, fixes issues w/multiple target devices
- add lirc_imon pure input mode support for onboard decode devices
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- config-generic 4 Nov 2009 17:00:19 -0000 1.331
+++ config-generic 28 Nov 2009 06:55:16 -0000 1.332
@@ -3786,8 +3786,7 @@ CONFIG_MARKERS=y
CONFIG_DEFAULT_RELATIME=y
# LIRC
-CONFIG_INPUT_LIRC=y
-CONFIG_LIRC_DEV=m
+CONFIG_INPUT_LIRC=m
CONFIG_LIRC_BT829=m
CONFIG_LIRC_ENE0100=m
CONFIG_LIRC_I2C=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1938
retrieving revision 1.1939
diff -u -p -r1.1938 -r1.1939
--- kernel.spec 27 Nov 2009 16:11:29 -0000 1.1938
+++ kernel.spec 28 Nov 2009 06:55:16 -0000 1.1939
@@ -2157,6 +2157,10 @@ fi
# and build.
%changelog
+* Fri Nov 27 2009 Jarod Wilson <jarod at redhat.com> 2.6.31.6-153
+- add device name to lirc_zilog, fixes issues w/multiple target devices
+- add lirc_imon pure input mode support for onboard decode devices
+
* Wed Nov 26 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.6-152
- Fix intel_tv_mode_set oops (#540218)
lirc-2.6.31.patch:
MAINTAINERS | 9
drivers/input/Kconfig | 2
drivers/input/Makefile | 2
drivers/input/lirc/Kconfig | 114 +
drivers/input/lirc/Makefile | 21
drivers/input/lirc/lirc.h | 100 +
drivers/input/lirc/lirc_bt829.c | 383 +++++
drivers/input/lirc/lirc_dev.c | 837 +++++++++++
drivers/input/lirc/lirc_dev.h | 194 ++
drivers/input/lirc/lirc_ene0100.c | 645 ++++++++
drivers/input/lirc/lirc_ene0100.h | 169 ++
drivers/input/lirc/lirc_i2c.c | 538 +++++++
drivers/input/lirc/lirc_igorplugusb.c | 556 +++++++
drivers/input/lirc/lirc_imon.c | 2467 ++++++++++++++++++++++++++++++++++
drivers/input/lirc/lirc_imon.h | 209 ++
drivers/input/lirc/lirc_it87.c | 986 +++++++++++++
drivers/input/lirc/lirc_it87.h | 116 +
drivers/input/lirc/lirc_ite8709.c | 540 +++++++
drivers/input/lirc/lirc_mceusb.c | 1232 ++++++++++++++++
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 | 1316 ++++++++++++++++++
drivers/input/lirc/lirc_sir.c | 1283 +++++++++++++++++
drivers/input/lirc/lirc_streamzap.c | 794 ++++++++++
drivers/input/lirc/lirc_ttusbir.c | 397 +++++
drivers/input/lirc/lirc_zilog.c | 1396 +++++++++++++++++++
27 files changed, 15972 insertions(+)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.4 -r 1.5 lirc-2.6.31.patchIndex: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/lirc-2.6.31.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lirc-2.6.31.patch 12 Oct 2009 14:51:35 -0000 1.4
+++ lirc-2.6.31.patch 28 Nov 2009 06:55:17 -0000 1.5
@@ -1,6 +1,6 @@
Linux Infrared Remote Control drivers -- http://www.lirc.org
-Last updated: Thursday, September 03, 2009
+Last updated: Friday, November 27, 2009
From http://git.wilsonet.com/linux-2.6-lirc.git/
@@ -10,36 +10,37 @@ Signed-off-by: Jarod Wilson <jarod at redha
MAINTAINERS | 9 +
drivers/input/Kconfig | 2 +
drivers/input/Makefile | 2 +
- drivers/input/lirc/Kconfig | 119 ++
+ drivers/input/lirc/Kconfig | 114 ++
drivers/input/lirc/Makefile | 21 +
drivers/input/lirc/lirc.h | 100 ++
- drivers/input/lirc/lirc_bt829.c | 383 ++++++
- drivers/input/lirc/lirc_dev.c | 839 ++++++++++++
- drivers/input/lirc/lirc_dev.h | 184 +++
- drivers/input/lirc/lirc_ene0100.c | 644 +++++++++
+ drivers/input/lirc/lirc_bt829.c | 383 +++++
+ drivers/input/lirc/lirc_dev.c | 837 +++++++++++
+ drivers/input/lirc/lirc_dev.h | 194 +++
+ drivers/input/lirc/lirc_ene0100.c | 645 +++++++++
drivers/input/lirc/lirc_ene0100.h | 169 +++
- drivers/input/lirc/lirc_i2c.c | 537 ++++++++
+ drivers/input/lirc/lirc_i2c.c | 538 +++++++
drivers/input/lirc/lirc_igorplugusb.c | 556 ++++++++
- drivers/input/lirc/lirc_imon.c | 2301 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c | 986 ++++++++++++++
+ drivers/input/lirc/lirc_imon.c | 2467 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.h | 209 +++
+ 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 | 1242 ++++++++++++++++++
+ drivers/input/lirc/lirc_ite8709.c | 540 +++++++
+ drivers/input/lirc/lirc_mceusb.c | 1232 ++++++++++++++++
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 | 1316 +++++++++++++++++++
- drivers/input/lirc/lirc_sir.c | 1283 ++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c | 794 ++++++++++++
+ drivers/input/lirc/lirc_serial.c | 1316 ++++++++++++++++++
+ drivers/input/lirc/lirc_sir.c | 1283 +++++++++++++++++
+ drivers/input/lirc/lirc_streamzap.c | 794 +++++++++++
drivers/input/lirc/lirc_ttusbir.c | 397 ++++++
- drivers/input/lirc/lirc_zilog.c | 1395 ++++++++++++++++++++
- 26 files changed, 15600 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_zilog.c | 1396 +++++++++++++++++++
+ 27 files changed, 15972 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 8dca9d8..f25dc26 100644
+index 81d68d5..f6af1bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3129,6 +3129,15 @@ W: http://www.pasemi.com/
+@@ -3219,6 +3219,15 @@ W: http://www.pasemi.com/
L: linuxppc-dev at ozlabs.org
S: Supported
@@ -80,15 +81,15 @@ index 4c9c745..99e2b5e 100644
+obj-$(CONFIG_INPUT_LIRC) += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
-index 0000000..ab13cfe
+index 0000000..8678018
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,114 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
-+ bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
++ tristate "Linux Infrared Remote Control IR receiver/transmitter drivers"
+ help
+ Say Y here, and all supported Linux Infrared Remote Control IR and
+ RF receiver and transmitter drivers will be displayed. When paired
@@ -97,20 +98,15 @@ index 0000000..ab13cfe
+
+if INPUT_LIRC
+
-+config LIRC_DEV
-+ tristate "LIRC device loadable module support"
-+ help
-+ LIRC device loadable module support, required for most LIRC drivers
-+
+config LIRC_BT829
+ tristate "BT829 based hardware"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for the IR interface on BT829-based hardware
+
+config LIRC_ENE0100
+ tristate "ENE KB3924/ENE0100 CIR Port Reciever"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ This is a driver for CIR port handled by ENE KB3924 embedded
+ controller found on some notebooks.
@@ -118,56 +114,56 @@ index 0000000..ab13cfe
+
+config LIRC_I2C
+ tristate "I2C Based IR Receivers"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for I2C-based IR receivers, such as those commonly
+ found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+ tristate "Igor Cesko's USB IR Receiver"
-+ depends on LIRC_DEV && USB
++ depends on INPUT_LIRC && USB
+ help
+ Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
-+ tristate "Soundgraph IMON Receiver"
-+ depends on LIRC_DEV
++ tristate "SoundGraph iMON Receiver and Display"
++ depends on INPUT_LIRC
+ help
-+ Driver for the Soundgraph IMON IR Receiver
++ Driver for the SoundGraph iMON IR Receiver and Display
+
+config LIRC_IT87
+ tristate "ITE IT87XX CIR Port Receiver"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+ tristate "ITE8709 CIR Port Receiver"
-+ depends on LIRC_DEV && PNP
++ depends on INPUT_LIRC && PNP
+ help
+ Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+ tristate "Windows Media Center Ed. USB IR Transceiver"
-+ depends on LIRC_DEV && USB
++ depends on INPUT_LIRC && USB
+ help
+ Driver for Windows Media Center Ed. USB IR Transceivers
+
+config LIRC_PARALLEL
+ tristate "Homebrew Parallel Port Receiver"
-+ depends on LIRC_DEV && !SMP
++ depends on INPUT_LIRC && !SMP
+ help
+ Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+ tristate "Sasem USB IR Remote"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+ tristate "Homebrew Serial Port Receiver"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for Homebrew Serial Port Receivers
+
@@ -180,32 +176,32 @@ index 0000000..ab13cfe
+
+config LIRC_SIR
+ tristate "Built-in SIR IrDA port"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+ tristate "Streamzap PC Receiver"
-+ depends on LIRC_DEV
++ depends on INPUT_LIRC
+ help
+ Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+ tristate "Technotrend USB IR Receiver"
-+ depends on LIRC_DEV && USB
[...1952 lines suppressed...]
-+ dprintk("%s - ret = %d status = 0x%x 0x%x\n", __func__,
++ dev_dbg(ir->d->dev, "%s - ret = %d status = 0x%x 0x%x\n", __func__,
+ ret, data[0], data[1]);
+
+ /*
@@ -8526,29 +8903,29 @@ index 0000000..8b48a56
+ ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
+ USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
+ data, 2, HZ * 3);
-+ dprintk("%s - ret = %d, devnum = %d\n",
++ dev_dbg(ir->d->dev, "%s - ret = %d, devnum = %d\n",
+ __func__, ret, ir->usbdev->devnum);
-+ dprintk("%s - data[0] = %d, data[1] = %d\n",
++ dev_dbg(ir->d->dev, "%s - data[0] = %d, data[1] = %d\n",
+ __func__, data[0], data[1]);
+
-+ /* set feature */
++ /* set feature: bit rate 38400 bps */
+ ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
+ USB_REQ_SET_FEATURE, USB_TYPE_VENDOR,
+ 0xc04e, 0x0000, NULL, 0, HZ * 3);
+
-+ dprintk("%s - ret = %d\n", __func__, ret);
++ dev_dbg(ir->d->dev, "%s - ret = %d\n", __func__, ret);
+
-+ /* strange: bRequest == 4 */
++ /* bRequest 4: set char length to 8 bits */
+ ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
+ 4, USB_TYPE_VENDOR,
+ 0x0808, 0x0000, NULL, 0, HZ * 3);
-+ dprintk("%s - retB = %d\n", __func__, ret);
++ dev_dbg(ir->d->dev, "%s - retB = %d\n", __func__, ret);
+
-+ /* strange: bRequest == 2 */
++ /* bRequest 2: set handshaking to use DTR/DSR */
+ ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
+ 2, USB_TYPE_VENDOR,
+ 0x0000, 0x0100, NULL, 0, HZ * 3);
-+ dprintk("%s - retC = %d\n", __func__, ret);
++ dev_dbg(ir->d->dev, "%s - retC = %d\n", __func__, ret);
+
+ return ret;
+
@@ -8574,7 +8951,7 @@ index 0000000..8b48a56
+ int is_pinnacle;
+ int is_microsoft_gen1;
+
-+ dprintk(DRIVER_NAME ": %s called\n", __func__);
++ dev_dbg(&intf->dev, ": %s called\n", __func__);
+
+ usb_reset_device(dev);
+
@@ -8598,7 +8975,7 @@ index 0000000..8b48a56
+ || ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+ == USB_ENDPOINT_XFER_INT))) {
+
-+ dprintk(DRIVER_NAME ": acceptable inbound endpoint "
++ dev_dbg(&intf->dev, ": acceptable inbound endpoint "
+ "found\n");
+ ep_in = ep;
+ ep_in->bmAttributes = USB_ENDPOINT_XFER_INT;
@@ -8620,7 +8997,7 @@ index 0000000..8b48a56
+ || ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+ == USB_ENDPOINT_XFER_INT))) {
+
-+ dprintk(DRIVER_NAME ": acceptable outbound endpoint "
++ dev_dbg(&intf->dev, ": acceptable outbound endpoint "
+ "found\n");
+ ep_out = ep;
+ ep_out->bmAttributes = USB_ENDPOINT_XFER_INT;
@@ -8635,7 +9012,7 @@ index 0000000..8b48a56
+ }
+ }
+ if (ep_in == NULL) {
-+ dprintk(DRIVER_NAME ": inbound and/or endpoint not found\n");
++ dev_dbg(&intf->dev, ": inbound and/or endpoint not found\n");
+ return -ENODEV;
+ }
+
@@ -8679,7 +9056,7 @@ index 0000000..8b48a56
+ goto mem_failure_switch;
+ }
+
-+ strcpy(driver->name, DRIVER_NAME " ");
++ strcpy(driver->name, DRIVER_NAME);
+ driver->minor = -1;
+ driver->features = LIRC_CAN_SEND_PULSE |
+ LIRC_CAN_SET_TRANSMITTER_MASK |
@@ -8717,8 +9094,7 @@ index 0000000..8b48a56
+ case 2:
+ kfree(ir);
+ case 1:
-+ printk(DRIVER_NAME "[%d]: out of memory (code=%d)\n",
-+ devnum, mem_failure);
++ dev_info(&intf->dev, "out of memory (code=%d)\n", mem_failure);
+ return -ENOMEM;
+ }
+
@@ -8752,8 +9128,6 @@ index 0000000..8b48a56
+ buf, sizeof(buf)) > 0)
+ snprintf(name + strlen(name), sizeof(name) - strlen(name),
+ " %s", buf);
-+ printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name,
-+ dev->bus->busnum, devnum);
+
+ /* inbound data */
+ usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in,
@@ -8775,8 +9149,7 @@ index 0000000..8b48a56
+ */
+
+ usbret = usb_reset_configuration(dev);
-+ printk(DRIVER_NAME "[%d]: usb reset config ret %x\n",
-+ devnum, usbret);
++ dev_info(ir->d->dev, "usb reset config ret %x\n", usbret);
+
+ /*
+ * its possible we really should wait for a return
@@ -8817,6 +9190,9 @@ index 0000000..8b48a56
+
+ usb_set_intfdata(intf, ir);
+
++ dev_info(ir->d->dev, "Registered %s on usb%d:%d\n", name,
++ dev->bus->busnum, devnum);
++
+ return 0;
+}
+
@@ -8846,7 +9222,7 @@ index 0000000..8b48a56
+static int mceusb_dev_suspend(struct usb_interface *intf, pm_message_t message)
+{
+ struct mceusb_dev *ir = usb_get_intfdata(intf);
-+ printk(DRIVER_NAME "[%d]: suspend\n", ir->devnum);
++ dev_info(ir->d->dev, "suspend\n");
+ usb_kill_urb(ir->urb_in);
+ return 0;
+}
@@ -8854,7 +9230,7 @@ index 0000000..8b48a56
+static int mceusb_dev_resume(struct usb_interface *intf)
+{
+ struct mceusb_dev *ir = usb_get_intfdata(intf);
-+ printk(DRIVER_NAME "[%d]: resume\n", ir->devnum);
++ dev_info(ir->d->dev, "resume\n");
+ if (usb_submit_urb(ir->urb_in, GFP_ATOMIC))
+ return -EIO;
+ return 0;
@@ -8876,11 +9252,13 @@ index 0000000..8b48a56
+
+ printk(KERN_INFO DRIVER_NAME ": " DRIVER_DESC " " DRIVER_VERSION "\n");
+ printk(KERN_INFO DRIVER_NAME ": " DRIVER_AUTHOR "\n");
-+ dprintk(DRIVER_NAME ": debug mode enabled\n");
++ if (debug)
++ printk(KERN_DEBUG DRIVER_NAME ": debug mode enabled\n");
+
+ i = usb_register(&mceusb_dev_driver);
+ if (i < 0) {
-+ printk(DRIVER_NAME ": usb register failed, result = %d\n", i);
++ printk(KERN_ERR DRIVER_NAME
++ ": usb register failed, result = %d\n", i);
+ return -ENODEV;
+ }
+
@@ -11912,7 +12290,7 @@ index 0000000..d602e90
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
new file mode 100644
-index 0000000..b497642
+index 0000000..d28d006
--- /dev/null
+++ b/drivers/input/lirc/lirc_sir.c
@@ -0,0 +1,1283 @@
@@ -12292,7 +12670,7 @@ index 0000000..b497642
+ case LIRC_SET_SEND_DUTY_CYCLE:
+ retval = get_user(ivalue, (unsigned int *) arg);
+ if (retval)
-+ return reetval;
++ return retval;
+ if (ivalue <= 0 || ivalue > 100)
+ return -EINVAL;
+ /* (ivalue/100)*(1000000/freq) */
@@ -14404,10 +14782,10 @@ index 0000000..2955bad
+module_exit(ttusbir_exit_module);
diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
new file mode 100644
-index 0000000..c4080f5
+index 0000000..b19c447
--- /dev/null
+++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1395 @@
+@@ -0,0 +1,1396 @@
+/*
+ * i2c IR lirc driver for devices with zilog IR processors
+ *
@@ -15703,6 +16081,7 @@ index 0000000..c4080f5
+ ir->l.fops = &lirc_fops;
+ ir->l.data = ir;
+ ir->l.minor = minor;
++ ir->l.dev = &adap->dev;
+ ir->l.sample_rate = 0;
+
+ /* register with lirc */
More information about the fedora-extras-commits
mailing list