rpms/kernel/devel linux-2.6.27-lirc.patch, NONE, 1.1 config-generic, 1.186, 1.187 kernel.spec, 1.1070, 1.1071 linux-2.6-lirc.patch, 1.15, NONE
Jarod Wilson
jwilson at fedoraproject.org
Tue Oct 21 21:09:28 UTC 2008
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29272
Modified Files:
config-generic kernel.spec
Added Files:
linux-2.6.27-lirc.patch
Removed Files:
linux-2.6-lirc.patch
Log Message:
* Tue Oct 21 2008 Jarod Wilson <jarod at redhat.com> 2.6.27.3-35.rc1
- improved lirc support for iMon LCD/IR devices
- lirc support for additional MCE transceivers
- nuke lirc commandir kernel drivers, lirc 0.8.4 talks to the via userspace
- nuke lirc atiusb kernel drivers, conflicts with ati_remote (#462212), and
one can keep using lirc w/these via the atilibusb userspace driver
linux-2.6.27-lirc.patch:
--- NEW FILE linux-2.6.27-lirc.patch ---
Linux Infrared Remote Control drivers
Signed-off-by: Jarod Wilson <jarod at redhat.com>
---
diff -Naurp linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c
--- linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c 2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c 2008-10-21 16:40:06.000000000 -0400
@@ -386,6 +386,8 @@
#define USB_VENDOR_ID_SOUNDGRAPH 0x15c2
#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD 0x0038
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2 0x0036
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3 0x0034
#define USB_VENDOR_ID_SUN 0x0430
#define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab
@@ -585,6 +587,8 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
diff -Naurp linux-2.6.27.noarch/drivers/input/Kconfig linux-2.6.27.noarch.lirc/drivers/input/Kconfig
--- linux-2.6.27.noarch/drivers/input/Kconfig 2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch.lirc/drivers/input/Kconfig 2008-10-21 16:03:34.000000000 -0400
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
source "drivers/input/touchscreen/Kconfig"
+source "drivers/input/lirc/Kconfig"
+
source "drivers/input/misc/Kconfig"
endif
diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Kconfig linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig
--- linux-2.6.27.noarch/drivers/input/lirc/Kconfig 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig 2008-10-21 16:04:34.000000000 -0400
@@ -0,0 +1,128 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+ bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+ default n
+ help
+ Say Y here, and all supported Linux Infrared Remote Control IR and
+ RF receiver and transmitter drivers will be displayed. When paired
+ with a remote control and the lirc daemon, the receiver drivers
+ allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_DEV
+ tristate "LIRC device loadable module support"
+ default n
+ help
+ LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_BT829
+ tristate "BT829 based hardware"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the IR interface on BT829-based hardware
+
+config LIRC_I2C
+ tristate "I2C Based IR Receivers"
+ default n
+ depends on LIRC_DEV
+ 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"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+ tristate "Soundgraph IMON Receiver"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+ tristate "ITE IT87XX CIR Port Receiver"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+ tristate "ITE8709 CIR Port Receiver"
+ default n
+ depends on LIRC_DEV && PNP
+ help
+ Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+ tristate "Microsoft Media Center Ed. Receiver, v1"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Microsoft Media Center Ed. Receiver, v1
+
+config LIRC_MCEUSB2
+ tristate "Microsoft Media Center Ed. Receiver, v2"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Microsoft Media Center Ed. Receiver, v2
+
+config LIRC_PARALLEL
+ tristate "Homebrew Parallel Port Receiver"
+ default n
+ depends on LIRC_DEV && !SMP
+ help
+ Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+ tristate "Sasem USB IR Remote"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+ tristate "Homebrew Serial Port Receiver"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for Homebrew Serial Port Receivers
+
+config LIRC_SIR
+ tristate "Built-in SIR IrDA port"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+ tristate "Streamzap PC Receiver"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+ tristate "Technotrend USB IR Receiver"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
+ tristate "Zilog/Hauppauge IR Transmitter"
+ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Zilog/Hauppauge IR Transmitter, found on
+ PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
+
+endif
diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c
--- linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c 2008-10-21 16:03:34.000000000 -0400
@@ -0,0 +1,388 @@
+/*
+ * Remote control driver for the TV-card based on bt829
+ *
+ * by Leonid Froenchenko <lfroen at galileo.co.il>
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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>
+
+#include <linux/autoconf.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
[...14646 lines suppressed...]
+ if (ret != 0)
+ goto err;
+ }
+ return 0;
+
+err:
+ /* undo everything, hopefully... */
+ if (ir->c_rx.addr)
+ ir_detach(&ir->c_rx);
+ if (ir->c_tx.addr)
+ ir_detach(&ir->c_tx);
+ return ret;
+}
+
+static int ir_detach(struct i2c_client *client)
+{
+ struct IR *ir = i2c_get_clientdata(client);
+ mutex_lock(&ir->lock);
+
+ if (client == &ir->c_rx) {
+ DECLARE_COMPLETION(tn);
+ DECLARE_COMPLETION(tn2);
+
+ /* end up polling thread */
+ if (ir->task && !IS_ERR(ir->task)) {
+ ir->t_notify = &tn;
+ ir->t_notify2 = &tn2;
+ ir->shutdown = 1;
+ wake_up_process(ir->task);
+ complete(&tn2);
+ wait_for_completion(&tn);
+ ir->t_notify = NULL;
+ ir->t_notify2 = NULL;
+ }
+
+ /* unregister device */
+ i2c_detach_client(&ir->c_rx);
+ } else if (client == &ir->c_tx) {
+ i2c_detach_client(&ir->c_tx);
+ } else {
+ mutex_unlock(&ir->lock);
+ zilog_error("ir_detach: detached from something we didn't "
+ "attach to\n");
+ return -ENODEV;
+ }
+
+ --ir->devs;
+ if (ir->devs < 0) {
+ mutex_unlock(&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);
+ mutex_unlock(&ir->lock);
+ kfree(ir);
+ return 0;
+ }
+ mutex_unlock(&ir->lock);
+ return 0;
+}
+
+static int ir_probe(struct i2c_adapter *adap)
+{
+ struct i2c_client c;
+ char buf;
+
+ if (adap->id == I2C_HW_B_BT848 ||
+ adap->id == I2C_HW_B_CX2341X) {
+ int have_rx = 0, have_tx = 0;
+
+ /*
+ * The external IR receiver is at i2c address 0x71.
+ * The IR transmitter is at 0x70.
+ */
+ memset(&c, 0, sizeof(c));
+ c.adapter = adap;
+ c.addr = 0x70;
+
+ 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);
+ }
+
+ return 0;
+}
+
+static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
+{
+ /* nothing */
+ return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+#ifdef MODULE
+
+int init_module(void)
+{
+ mutex_init(&tx_data_lock);
+ request_module("ivtv");
+ request_module("firmware_class");
+ i2c_add_driver(&driver);
+ return 0;
+}
+
+void cleanup_module(void)
+{
+ i2c_del_driver(&driver);
+ /* if loaded */
+ fw_unload();
+}
+
+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");
+
+#endif /* MODULE */
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Makefile linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile
--- linux-2.6.27.noarch/drivers/input/lirc/Makefile 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile 2008-10-21 16:04:26.000000000 -0400
@@ -0,0 +1,23 @@
+# Makefile for the lirc drivers.
+#
+
+# Each configuration option enables a list of files.
+
+EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
+
+obj-$(CONFIG_LIRC_DEV) += lirc_dev.o
+obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o
+obj-$(CONFIG_LIRC_I2C) += lirc_i2c.o
+obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
+obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
+obj-$(CONFIG_LIRC_IT87) += lirc_it87.o
+obj-$(CONFIG_LIRC_ITE8709) += lirc_ite8709.o
+obj-$(CONFIG_LIRC_MCEUSB) += lirc_mceusb.o
+obj-$(CONFIG_LIRC_MCEUSB2) += lirc_mceusb2.o
+obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o
+obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
+obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
+obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
+obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o
+obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
+obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o
diff -Naurp linux-2.6.27.noarch/drivers/input/Makefile linux-2.6.27.noarch.lirc/drivers/input/Makefile
--- linux-2.6.27.noarch/drivers/input/Makefile 2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch.lirc/drivers/input/Makefile 2008-10-21 16:03:34.000000000 -0400
@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/
obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o
obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC) += lirc/
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- config-generic 19 Oct 2008 19:12:46 -0000 1.186
+++ config-generic 21 Oct 2008 21:08:57 -0000 1.187
@@ -3583,9 +3583,7 @@
# LIRC
CONFIG_INPUT_LIRC=y
CONFIG_LIRC_DEV=m
-CONFIG_LIRC_ATIUSB=m
CONFIG_LIRC_BT829=m
-CONFIG_LIRC_CMDIR=m
CONFIG_LIRC_I2C=m
CONFIG_LIRC_IGORPLUGUSB=m
CONFIG_LIRC_IMON=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -u -r1.1070 -r1.1071
--- kernel.spec 21 Oct 2008 04:43:00 -0000 1.1070
+++ kernel.spec 21 Oct 2008 21:08:57 -0000 1.1071
@@ -631,7 +631,7 @@
Patch700: linux-2.6-nfs-client-mounts-hang.patch
Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
-Patch1515: linux-2.6-lirc.patch
+Patch1515: linux-2.6.27-lirc.patch
Patch1520: linux-2.6-hdpvr.patch
# Fix the return code CD accesses when the CDROM drive door is closed
@@ -1207,7 +1207,7 @@
ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
# http://www.lirc.org/
-ApplyPatch linux-2.6-lirc.patch
+ApplyPatch linux-2.6.27-lirc.patch
# http://hg.jannau.net/hdpvr/
ApplyPatch linux-2.6-hdpvr.patch
@@ -1842,7 +1842,14 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
-* Tue Oct 21 2008 Dave Airlie <airlied at redhat.com>
+* Tue Oct 21 2008 Jarod Wilson <jarod at redhat.com> 2.6.27.3-35.rc1
+- improved lirc support for iMon LCD/IR devices
+- lirc support for additional MCE transceivers
+- nuke lirc commandir kernel drivers, lirc 0.8.4 talks to the via userspace
+- nuke lirc atiusb kernel drivers, conflicts with ati_remote (#462212), and
+ one can keep using lirc w/these via the atilibusb userspace driver
+
+* Tue Oct 21 2008 Dave Airlie <airlied at redhat.com> 2.6.27.3-34.rc1
- rebase to drm-next from upstream for GEM fixes.
- drop intel modesetting for now - broken by rebase
@@ -1855,10 +1862,10 @@
* Mon Oct 20 2008 David Woodhouse <David.Woodhouse at intel.com>
- Fix %%{_arch} vs. $Arch confusion in fix for #465486
-* Mon Oct 20 2008 Dave Airlie <airlied at redhat.com>
+* Mon Oct 20 2008 Dave Airlie <airlied at redhat.com>
- radeon: fix VRAM sizing issue
-* Mon Oct 20 2008 Dave Airlie <airlied at redhat.com>
+* Mon Oct 20 2008 Dave Airlie <airlied at redhat.com>
- radeon: fix writeback + some warning fixes
* Sun Oct 19 2008 Dave Jones <davej at redhat.com>
--- linux-2.6-lirc.patch DELETED ---
More information about the scm-commits
mailing list