rpms/kernel/devel linux-2.6-lirc.patch, NONE, 1.1 config-generic, 1.23, 1.24 kernel.spec, 1.123, 1.124
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Mon Aug 27 21:23:42 UTC 2007
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18685
Modified Files:
config-generic kernel.spec
Added Files:
linux-2.6-lirc.patch
Log Message:
* Mon Aug 27 2007 Jarod Wilson <jwilson at redhat.com>
- Add lirc.org drivers to kernel build
linux-2.6-lirc.patch:
--- NEW FILE linux-2.6-lirc.patch ---
This patch adds the lirc drivers for assorted infrared and RF receivers
and transmitters, which when coupled with the lirc daemon and appropriate
config files, lets you control your linux box via a remote control. Very
useful stuff for media center boxes...
Upstream
--------
http://www.lirc.org/
Work-in-progress for upstream
-----------------------------
http://git.wilsonet.com/linux-2.6-lirc.git/
--
Jarod Wilson
jwilson at redhat.com
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 2d87357..61fd0ca 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -183,5 +183,7 @@ source "drivers/input/gameport/Kconfig"
endmenu
+source "drivers/input/lirc/Kconfig"
+
endmenu
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 15eb752..195d342 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -22,4 +22,4 @@ obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
obj-$(CONFIG_INPUT_TABLET) += tablet/
obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
obj-$(CONFIG_INPUT_MISC) += misc/
-
+obj-$(CONFIG_INPUT_LIRC) += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..138e58a
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,127 @@
+#
+# 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 m
+ help
+ LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_ATIUSB
+ tristate "ATI RF USB Receiver support"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the ATI USB RF remote receiver
+
+config LIRC_BT829
+ tristate "BT829 based hardware"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the IR interface on BT829-based hardware
+
+config LIRC_CMDIR
+ tristate "CommandIR USB Transceiver"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the CommandIR USB Transceiver
+
+config LIRC_I2C
+ tristate "I2C Based IR Receivers"
+ default m
+ 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 m
+ depends on LIRC_DEV
+ help
+ Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+ tristate "Soundgraph IMON Receiver"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+ tristate "ITE IT87XX CIR Port Receiver"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the ITE IT87xx IR Receiver
+
+config LIRC_MCEUSB
+ tristate "Microsoft Media Center Ed. Receiver, v1"
+ default m
+ 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 m
+ depends on LIRC_DEV
+ help
+ Driver for the Microsoft Media Center Ed. Receiver, v2
+
+config LIRC_PVR150
+ tristate "Hauppauge PVR-XXX Transmitter"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the Hauppauge PVR-150/250/350/500 IR Transmitter
+
+config LIRC_PARALLEL
+ tristate "Homebrew Parallel Port Receiver"
+ default m
+ depends on LIRC_DEV && !SMP
+ help
+ Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SERIAL
+ tristate "Homebrew Serial Port Receiver"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for Homebrew Serial Port Receivers
+
+config LIRC_SIR
+ tristate "Built-in SIR IrDA port"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+ tristate "Streamzap PC Receiver"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+ tristate "Technotrend USB IR Receiver"
+ default m
+ depends on LIRC_DEV
+ help
+ Driver for the Technotrend USB IR Receiver
+
+endif
diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
new file mode 100644
index 0000000..71124ef
--- /dev/null
+++ b/drivers/input/lirc/Makefile
@@ -0,0 +1,24 @@
+# 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_ATIUSB) += lirc_atiusb.o
+obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o
+obj-$(CONFIG_LIRC_CMDIR) += lirc_cmdir.o commandir.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_MCEUSB) += lirc_mceusb.o
+obj-$(CONFIG_LIRC_MCEUSB2) += lirc_mceusb2.o
+obj-$(CONFIG_LIRC_PVR150) += lirc_pvr150.o
+obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o
[...17742 lines suppressed...]
+ 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+static void urb_complete(struct urb *urb)
+{
+ struct ttusbir_device *ttusbir;
+ unsigned char *buf;
+ int i;
+ lirc_t l;
+
+ ttusbir = urb->context;
+
+ if (!ttusbir->opened)
+ return;
+
+ buf = (unsigned char *)urb->transfer_buffer;
+
+ for (i = 0; i < 128; i++) {
+ buf[i] = ~map_table[buf[i]];
+ if (ttusbir->last_pulse == buf[i]) {
+ if (ttusbir->last_num < PULSE_MASK/63)
+ ttusbir->last_num++;
+ /* else we are in a idle period and do not need to
+ * increment any longer */
+ } else {
+ l = ttusbir->last_num * 62; /* about 62 = us/byte */
+ if (ttusbir->last_pulse) /* pulse or space? */
+ l |= PULSE_BIT;
+ if (!lirc_buffer_full(&ttusbir->rbuf)) {
+ lirc_buffer_write_1(&ttusbir->rbuf, (void *)&l);
+ wake_up_interruptible(&ttusbir->rbuf.wait_poll);
+ }
+ ttusbir->last_num = 0;
+ ttusbir->last_pulse = buf[i];
+ }
+ }
+ usb_submit_urb(urb, GFP_ATOMIC); /* keep data rolling :-) */
+}
+
+/* Called whenever the USB subsystem thinks we could be the right driver
+ to handle this device
+*/
+static int probe(struct usb_interface *intf, const struct usb_device_id *id)
+{
+ int alt_set, endp;
+ int found = 0;
+ int i, j;
+ struct usb_host_interface *host_interf;
+ struct usb_interface_descriptor *interf_desc;
+ struct usb_host_endpoint *host_endpoint;
+ struct ttusbir_device *ttusbir;
+
+ DPRINTK("Module ttusbir probe\n");
+
+ ttusbir = (struct ttusbir_device *)kzalloc(sizeof(struct ttusbir_device), GFP_KERNEL);
+ if (!ttusbir)
+ return -ENOMEM;
+ ttusbir->driver = &driver;
+ ttusbir->alt_setting = -1;
+ ttusbir->udev = usb_get_dev(interface_to_usbdev(intf));
+ ttusbir->interf = intf;
+ ttusbir->last_pulse = 0x00;
+ ttusbir->last_num = 0;
+
+ /* Now look for interface setting we can handle
+ We are searching for the alt setting where end point
+ 0x82 has max packet size 16
+ */
+ for (alt_set = 0; alt_set < intf->num_altsetting && !found; alt_set++) {
+ host_interf = &intf->altsetting[alt_set];
+ interf_desc = &host_interf->desc;
+ for (endp = 0; endp < interf_desc->bNumEndpoints; endp++) {
+ host_endpoint = &host_interf->endpoint[endp];
+ if ((host_endpoint->desc.bEndpointAddress == 0x82) &&
+ (host_endpoint->desc.wMaxPacketSize == 0x10)) {
+ ttusbir->alt_setting = alt_set;
+ ttusbir->endpoint = endp;
+ found = 1;
+ break;
+ }
+ }
+ }
+ if (ttusbir->alt_setting != -1)
+ DPRINTK("alt setting: %d\n", ttusbir->alt_setting);
+ else {
+ err("Could not find alternate setting\n");
+ kfree(ttusbir);
+ return -EINVAL;
+ }
+
+ /* OK lets setup this interface setting */
+ usb_set_interface(ttusbir->udev, 0, ttusbir->alt_setting);
+
+ /* Store device info in interface structure */
+ usb_set_intfdata(intf, ttusbir);
+
+ /* Register as a LIRC plugin */
+ if (lirc_buffer_init(&ttusbir->rbuf, sizeof(lirc_t), 256) < 0) {
+ err("Could not get memory for LIRC data buffer\n");
+ usb_set_intfdata(intf, NULL);
+ kfree(ttusbir);
+ return -ENOMEM;
+ }
+ strcpy(ttusbir->plugin.name, "TTUSBIR");
+ ttusbir->plugin.minor = -1;
+ ttusbir->plugin.code_length = 1;
+ ttusbir->plugin.sample_rate = 0;
+ ttusbir->plugin.data = ttusbir;
+ ttusbir->plugin.add_to_buf = NULL;
+ ttusbir->plugin.get_queue = NULL;
+ ttusbir->plugin.rbuf = &ttusbir->rbuf;
+ ttusbir->plugin.set_use_inc = set_use_inc;
+ ttusbir->plugin.set_use_dec = set_use_dec;
+ ttusbir->plugin.ioctl = NULL;
+ ttusbir->plugin.fops = NULL;
+ 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;
+ }
+
+ /* 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;
+ }
+ }
+ return 0;
+}
+
+/* Called when the driver is unloaded or the device is unplugged
+ */
+static void disconnect(struct usb_interface *intf)
+{
+ int i;
+ struct ttusbir_device *ttusbir;
+
+ DPRINTK("Module ttusbir disconnect\n");
+
+ lock_kernel();
+ ttusbir = (struct ttusbir_device *) usb_get_intfdata(intf);
+ usb_set_intfdata(intf, NULL);
+ lirc_unregister_plugin(ttusbir->minor);
+ unlock_kernel();
+
+ for (i = 0; i < NUM_URBS; i++)
+ usb_free_urb(ttusbir->urb[i]);
+ lirc_buffer_free(&ttusbir->rbuf);
+ kfree(ttusbir);
+}
+
+static int ttusbir_init_module(void)
+{
+ int result;
+
+ DPRINTK(KERN_DEBUG "Module ttusbir init\n");
+
+ /* register this driver with the USB subsystem */
+ result = usb_register(&driver);
+ if (result)
+ err("usb_register failed. Error number %d", result);
+ return result;
+}
+
+static void ttusbir_exit_module(void)
+{
+ printk(KERN_DEBUG "Module ttusbir exit\n");
+ /* deregister this driver with the USB subsystem */
+ usb_deregister(&driver);
+}
+
+module_init(ttusbir_init_module);
+module_exit(ttusbir_exit_module);
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-generic 24 Aug 2007 01:45:52 -0000 1.23
+++ config-generic 27 Aug 2007 21:23:08 -0000 1.24
@@ -3238,3 +3238,22 @@
# CONFIG_CRC7 is not set
CONFIG_DEFAULT_RELATIME=y
+
+# 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
+CONFIG_LIRC_IT87=m
+CONFIG_LIRC_MCEUSB=m
+CONFIG_LIRC_MCEUSB2=m
+CONFIG_LIRC_PVR150=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_STREAMZAP=m
+CONFIG_LIRC_TTUSBIR=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kernel.spec 27 Aug 2007 14:57:59 -0000 1.123
+++ kernel.spec 27 Aug 2007 21:23:08 -0000 1.124
@@ -665,6 +665,7 @@
Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
Patch1508: linux-2.6-firewire-multi-lun.patch
+Patch1515: linux-2.6-lirc.patch
%endif
@@ -1183,6 +1184,9 @@
#
ApplyPatch linux-2.6-firewire-multi-lun.patch
+# http://www.lirc.org/
+ApplyPatch linux-2.6-lirc.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1772,6 +1776,9 @@
%changelog
+* Mon Aug 27 2007 Jarod Wilson <jwilson at redhat.com>
+- Add lirc.org drivers to kernel build
+
* Mon Aug 27 2007 Kristian Høgsberg <krh at redhat.com>
- Add patch from Stefan Richter to support multi-lun SBP-2 devices (#242254).
More information about the fedora-extras-commits
mailing list