rpms/kernel/devel config-generic, 1.164, 1.165 kernel.spec, 1.928, 1.929 linux-2.6-lirc.patch, 1.11, 1.12
Jarod Wilson
jwilson at fedoraproject.org
Fri Sep 5 04:25:59 UTC 2008
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20923
Modified Files:
config-generic kernel.spec linux-2.6-lirc.patch
Log Message:
* Fri Sep 05 2008 Jarod Wilson <jarod at redhat.com>
- More lirc updates:
* convert single-holder semaphores to mutexes
* actually build lirc_sasem driver
* assorted compile-time warning cleanups
* add lirc_ite8709 driver
* sync with latest lirc cvs
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- config-generic 2 Sep 2008 22:27:17 -0000 1.164
+++ config-generic 5 Sep 2008 04:25:29 -0000 1.165
@@ -3578,11 +3578,13 @@
CONFIG_LIRC_IGORPLUGUSB=m
CONFIG_LIRC_IMON=m
CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
CONFIG_LIRC_MCEUSB=m
CONFIG_LIRC_MCEUSB2=m
CONFIG_LIRC_ZILOG=m
CONFIG_LIRC_PARALLEL=m
CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SASEM=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.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- kernel.spec 5 Sep 2008 01:28:57 -0000 1.928
+++ kernel.spec 5 Sep 2008 04:25:29 -0000 1.929
@@ -1747,6 +1747,14 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Fri Sep 05 2008 Jarod Wilson <jarod at redhat.com>
+- More lirc updates:
+ * convert single-holder semaphores to mutexes
+ * actually build lirc_sasem driver
+ * assorted compile-time warning cleanups
+ * add lirc_ite8709 driver
+ * sync with latest lirc cvs
+
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
- modesetting updates - fix AMD rs690 - roll in krh dri2 patch
linux-2.6-lirc.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 linux-2.6-lirc.patch
Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-lirc.patch 3 Sep 2008 19:19:48 -0000 1.11
+++ linux-2.6-lirc.patch 5 Sep 2008 04:25:29 -0000 1.12
@@ -1,33 +1,39 @@
+Linux Infrared Remote Control drivers
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+---
+
drivers/input/Kconfig | 2 +
drivers/input/Makefile | 2 +
- drivers/input/lirc/Kconfig | 128 +++
- drivers/input/lirc/Makefile | 24 +
- drivers/input/lirc/commandir.c | 1009 +++++++++++++++++++++++
- drivers/input/lirc/commandir.h | 41 +
- drivers/input/lirc/kcompat.h | 142 ++++
- drivers/input/lirc/lirc.h | 102 +++
- drivers/input/lirc/lirc_atiusb.c | 1328 +++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_bt829.c | 393 +++++++++
- drivers/input/lirc/lirc_cmdir.c | 605 ++++++++++++++
- drivers/input/lirc/lirc_cmdir.h | 27 +
- drivers/input/lirc/lirc_dev.c | 827 +++++++++++++++++++
- drivers/input/lirc/lirc_dev.h | 264 ++++++
- drivers/input/lirc/lirc_i2c.c | 668 ++++++++++++++++
- drivers/input/lirc/lirc_igorplugusb.c | 624 +++++++++++++++
- drivers/input/lirc/lirc_imon.c | 1248 +++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c | 1012 +++++++++++++++++++++++
+ drivers/input/lirc/Kconfig | 142 ++++
+ drivers/input/lirc/Makefile | 25 +
+ drivers/input/lirc/commandir.c | 982 +++++++++++++++++++++++
+ drivers/input/lirc/commandir.h | 68 ++
+ drivers/input/lirc/lirc.h | 103 +++
+ drivers/input/lirc/lirc_atiusb.c | 1313 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_bt829.c | 388 +++++++++
+ drivers/input/lirc/lirc_cmdir.c | 600 ++++++++++++++
+ drivers/input/lirc/lirc_cmdir.h | 25 +
+ drivers/input/lirc/lirc_dev.c | 812 +++++++++++++++++++
+ drivers/input/lirc/lirc_dev.h | 262 ++++++
+ drivers/input/lirc/lirc_i2c.c | 643 +++++++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c | 611 ++++++++++++++
+ drivers/input/lirc/lirc_imon.c | 1280 ++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_it87.c | 1004 +++++++++++++++++++++++
drivers/input/lirc/lirc_it87.h | 116 +++
- drivers/input/lirc/lirc_mceusb.c | 890 +++++++++++++++++++++
- drivers/input/lirc/lirc_mceusb2.c | 1060 ++++++++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c | 745 +++++++++++++++++
+ drivers/input/lirc/lirc_ite8709.c | 565 +++++++++++++
+ drivers/input/lirc/lirc_mceusb.c | 884 +++++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb2.c | 1117 ++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_parallel.c | 732 +++++++++++++++++
drivers/input/lirc/lirc_parallel.h | 26 +
- drivers/input/lirc/lirc_sasem.c | 972 ++++++++++++++++++++++
- drivers/input/lirc/lirc_serial.c | 1348 +++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_sir.c | 1323 ++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c | 804 +++++++++++++++++++
- drivers/input/lirc/lirc_ttusbir.c | 393 +++++++++
- drivers/input/lirc/lirc_zilog.c | 1416 +++++++++++++++++++++++++++++++++
- 29 files changed, 17539 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_sasem.c | 967 +++++++++++++++++++++++
+ drivers/input/lirc/lirc_serial.c | 1316 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_sir.c | 1306 ++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_streamzap.c | 795 +++++++++++++++++++
+ drivers/input/lirc/lirc_ttusbir.c | 394 ++++++++++
+ drivers/input/lirc/lirc_zilog.c | 1397 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17877 insertions(+), 0 deletions(-)
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5f9d860..747633c 100644
@@ -53,10 +59,10 @@
+obj-$(CONFIG_INPUT_LIRC) += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
-index 0000000..62cfbf7
+index 0000000..44ad7cb
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,142 @@
+#
+# LIRC driver(s) configuration
+#
@@ -127,6 +133,13 @@
+ help
+ Driver for the ITE IT87xx IR Receiver
+
++config LIRC_ITE8709
++ tristate "ITE8709 CIR Port Receiver"
++ default m
++ depends on LIRC_DEV
++ help
++ Driver for the ITE8709 IR Receiver
++
+config LIRC_MCEUSB
+ tristate "Microsoft Media Center Ed. Receiver, v1"
+ default m
@@ -156,6 +169,13 @@
+ help
+ Driver for Homebrew Parallel Port Receivers
+
++config LIRC_SASEM
++ tristate "Sasem USB IR Remote"
++ default m
++ 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 m
@@ -187,10 +207,10 @@
+endif
diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
new file mode 100644
-index 0000000..d22dc5b
+index 0000000..506285d
--- /dev/null
+++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
+# Makefile for the lirc drivers.
+#
+
@@ -206,6 +226,7 @@
+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_ZILOG) += lirc_zilog.o
@@ -217,10 +238,10 @@
+obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
new file mode 100644
-index 0000000..eb63980
+index 0000000..a05b0d6
--- /dev/null
+++ b/drivers/input/lirc/commandir.c
-@@ -0,0 +1,1009 @@
+@@ -0,0 +1,982 @@
+
+/*
+ *
@@ -264,33 +285,6 @@
+};
+MODULE_DEVICE_TABLE(usb, cmdir_table);
+
-+static int cmdir_open(struct inode *inode, struct file *file);
-+static int cmdir_probe(struct usb_interface *interface,
-+ const struct usb_device_id *id);
-+static void cmdir_disconnect(struct usb_interface *interface);
-+static int cmdir_release(struct inode *inode, struct file *file);
-+static int cmdir_check(int device_num);
-+static void init_cmdir_var(int device_num);
-+static void reset_cmdir(int device_num);
-+static void update_cmdir_string(int device_num);
-+static void print_cmdir(int device_num);
-+static ssize_t cmdir_file_read(struct file *file, char *buffer,
-+ size_t count, loff_t *ppos);
-+ssize_t cmdir_read(unsigned char *buffer, size_t count);
-+static ssize_t cmdir_file_write(struct file *file, const char *buffer,
-+ size_t count, loff_t *ppos);
-+int cmdir_write(unsigned char *buffer, int count, void *callback_fct, int u);
-+int write_core(unsigned char *buffer, int count,
-+ void *callback_fct, int device_num);
-+static void cmdir_write_bulk_callback(struct urb *urb, struct pt_regs *regs);
-+int set_tx_channels(unsigned int next_tx);
-+
-+int add_cmdir_queue(unsigned char *buffer, int count,
-+ void *callback_vct, int usecdelay);
-+int cmdir_write_queue(unsigned char *buffer, int count, void *callback_vct);
-+int send_queue(void);
-+int wait_to_tx(int usecs);
-+
+/* circular packet queue */
+unsigned char ourbuffers[QUEUELENGTH][64];
+int waitusecs[QUEUELENGTH];
@@ -686,7 +680,7 @@
+ssize_t cmdir_read(unsigned char *buffer, size_t count)
+{
+ struct usb_skel *dev;
-+ int retval = 0;
++ int length, retval = 0;
+
+ struct usb_interface *interface;
+ interface = usb_find_interface(&cmdir_driver,
@@ -703,14 +697,14 @@
+ retval = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev,
+ dev->bulk_in_endpointAddr),
+ dev->bulk_in_buffer, min(dev->bulk_in_size, count),
-+ &count, HZ*10);
++ &length, HZ*10);
+ if (!retval) {
-+ if (!memcpy(buffer, dev->bulk_in_buffer, count))
[...4078 lines suppressed...]
-+ lirc_t command;
++ int command;
+
+ if (copy_from_user(&command, buf + i, sizeof(command))) {
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ return -EFAULT;
+ }
+
@@ -17251,7 +17605,7 @@
+ ret = send_code(ir, (unsigned)command >> 16,
+ (unsigned)command & 0xFFFF);
+ if (ret == -EPROTO) {
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ return ret;
+ }
+ }
@@ -17267,20 +17621,19 @@
+ if (failures >= 3) {
+ zilog_error("unable to send to the IR chip "
+ "after 3 resets, giving up\n");
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ return ret;
+ }
-+ ivtv_reset_ir_gpio(i2c_get_adapdata(ir->c_tx.adapter));
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout((100 * HZ + 999) / 1000);
+ ir->need_boot = 1;
+ ++failures;
+ } else
-+ i += sizeof(lirc_t);
++ i += sizeof(int);
+ }
+
+ /* Release i2c bus */
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+
+ /* All looks good */
+ return n;
@@ -17296,7 +17649,7 @@
+ if (ir->c_rx.addr == 0)
+ return -ENODEV;
+
-+ down(&ir->buf_sem);
++ mutex_lock(&ir->buf_lock);
+
+ poll_wait(filep, &ir->buf.wait_poll, wait);
+
@@ -17305,7 +17658,7 @@
+
+ ret = lirc_buffer_empty(&ir->buf) ? 0 : (POLLIN|POLLRDNORM);
+
-+ up(&ir->buf_sem);
++ mutex_unlock(&ir->buf_lock);
+ return ret;
+}
+
@@ -17388,15 +17741,15 @@
+ ir = ir_devices[minor];
+
+ /* increment in use count */
-+ down(&ir->lock);
++ mutex_lock(&ir->lock);
+ ++ir->open;
+ ret = set_use_inc(ir);
+ if (ret != 0) {
+ --ir->open;
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ return ret;
+ }
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+
+ /* stash our IR struct */
+ filep->private_data = ir;
@@ -17415,10 +17768,10 @@
+ }
+
+ /* decrement in use count */
-+ down(&ir->lock);
++ mutex_lock(&ir->lock);
+ --ir->open;
+ set_use_dec(ir);
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+
+ return 0;
+}
@@ -17442,7 +17795,6 @@
+ .owner = THIS_MODULE,
+ .name = "i2c ir driver",
+ },
-+ .id = I2C_DRIVERID_EXP3, /* FIXME */
+ .attach_adapter = ir_probe,
+ .detach_client = ir_detach,
+ .command = ir_command,
@@ -17474,11 +17826,10 @@
+ client->addr = 0;
+ return ret;
+ }
-+ ret = i2c_use_client(client);
-+ if (ret != 0) {
++ if (!i2c_use_client(client)) {
+ i2c_detach_client(client);
+ client->addr = 0;
-+ return ret;
++ return -EFAULT;
+ }
+ ++ir->devs;
+ return 0;
@@ -17500,8 +17851,8 @@
+ kfree(ir);
+ return -ENOMEM;
+ }
-+ init_MUTEX(&ir->lock);
-+ init_MUTEX(&ir->buf_sem);
++ mutex_init(&ir->lock);
++ mutex_init(&ir->buf_lock);
+ ir->open = 0;
+ ir->devs = 0;
+ ir->task = NULL;
@@ -17595,7 +17946,7 @@
+static int ir_detach(struct i2c_client *client)
+{
+ struct IR *ir = i2c_get_clientdata(client);
-+ down(&ir->lock);
++ mutex_lock(&ir->lock);
+
+ if (client == &ir->c_rx) {
+ DECLARE_COMPLETION(tn);
@@ -17618,7 +17969,7 @@
+ } else if (client == &ir->c_tx) {
+ i2c_detach_client(&ir->c_tx);
+ } else {
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ zilog_error("ir_detach: detached from something we didn't "
+ "attach to\n");
+ return -ENODEV;
@@ -17626,7 +17977,7 @@
+
+ --ir->devs;
+ if (ir->devs < 0) {
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ zilog_error("ir_detach: invalid device count\n");
+ return -ENODEV;
+ } else if (ir->devs == 0) {
@@ -17638,11 +17989,11 @@
+
+ /* free memory */
+ lirc_buffer_free(&ir->buf);
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ kfree(ir);
+ return 0;
+ }
-+ up(&ir->lock);
++ mutex_unlock(&ir->lock);
+ return 0;
+}
+
@@ -17651,13 +18002,8 @@
+ struct i2c_client c;
+ char buf;
+
-+#ifdef I2C_HW_B_CX2341X
-+ if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
-+ adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
-+#else
-+ if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
-+#endif
-+ {
++ 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
@@ -17704,7 +18050,7 @@
+
+int init_module(void)
+{
-+ init_MUTEX(&tx_data_lock);
++ mutex_init(&tx_data_lock);
+ request_module("ivtv");
+ request_module("firmware_class");
+ i2c_add_driver(&driver);
@@ -17737,8 +18083,6 @@
+module_param(disable_tx, bool, 0644);
+MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
+
-+EXPORT_NO_SYMBOLS;
-+
+#endif /* MODULE */
+
+/*
More information about the fedora-extras-commits
mailing list