rpms/kernel/F-10 linux-2.6.29-lirc.patch,1.4,1.5
Jarod Wilson
jwilson at fedoraproject.org
Thu Mar 12 04:54:19 UTC 2009
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19165
Modified Files:
linux-2.6.29-lirc.patch
Log Message:
I hate cvs...
linux-2.6.29-lirc.patch:
Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.29-lirc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.29-lirc.patch 4 Mar 2009 06:57:35 -0000 1.4
+++ linux-2.6.29-lirc.patch 12 Mar 2009 04:53:48 -0000 1.5
@@ -12,7 +12,7 @@
drivers/input/lirc/Makefile | 21 +
drivers/input/lirc/lirc.h | 100 +++
drivers/input/lirc/lirc_bt829.c | 383 +++++++++
- drivers/input/lirc/lirc_dev.c | 853 +++++++++++++++++++
+ drivers/input/lirc/lirc_dev.c | 848 +++++++++++++++++++
drivers/input/lirc/lirc_dev.h | 180 ++++
drivers/input/lirc/lirc_i2c.c | 649 ++++++++++++++
drivers/input/lirc/lirc_igorplugusb.c | 556 ++++++++++++
@@ -20,17 +20,17 @@
drivers/input/lirc/lirc_it87.c | 984 ++++++++++++++++++++++
drivers/input/lirc/lirc_it87.h | 116 +++
drivers/input/lirc/lirc_ite8709.c | 539 ++++++++++++
- drivers/input/lirc/lirc_mceusb.c | 747 +++++++++++++++++
- drivers/input/lirc/lirc_mceusb2.c | 1099 ++++++++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb.c | 749 +++++++++++++++++
+ drivers/input/lirc/lirc_mceusb2.c | 1098 ++++++++++++++++++++++++
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 | 1321 +++++++++++++++++++++++++++++
drivers/input/lirc/lirc_sir.c | 1294 ++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c | 775 +++++++++++++++++
+ drivers/input/lirc/lirc_streamzap.c | 777 +++++++++++++++++
drivers/input/lirc/lirc_ttusbir.c | 398 +++++++++
drivers/input/lirc/lirc_zilog.c | 1382 ++++++++++++++++++++++++++++++
- 25 files changed, 14681 insertions(+), 0 deletions(-)
+ 25 files changed, 14679 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 59fd2d1..ad1b16c 100644
@@ -334,7 +334,7 @@
+#endif
diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c
new file mode 100644
-index 0000000..c3852f2
+index 0000000..0485884
--- /dev/null
+++ b/drivers/input/lirc/lirc_bt829.c
@@ -0,0 +1,383 @@
@@ -412,20 +412,20 @@
+ my_dev = pci_get_device(PCI_VENDOR_ID_ATI,
+ PCI_DEVICE_ID_ATI_264VT, NULL);
+ if (my_dev) {
-+ printk(KERN_ERR DRIVER_NAME "Using device: %s\n",
++ printk(KERN_ERR DRIVER_NAME ": Using device: %s\n",
+ pci_name(my_dev));
+ pci_addr_phys = 0;
+ if (my_dev->resource[0].flags & IORESOURCE_MEM) {
+ pci_addr_phys = my_dev->resource[0].start;
-+ printk(KERN_INFO DRIVER_NAME "memory at 0x%08X \n",
++ printk(KERN_INFO DRIVER_NAME ": memory at 0x%08X \n",
+ (unsigned int)pci_addr_phys);
+ }
+ if (pci_addr_phys == 0) {
-+ printk(KERN_ERR DRIVER_NAME "no memory resource ?\n");
++ printk(KERN_ERR DRIVER_NAME ": no memory resource ?\n");
+ return NULL;
+ }
+ } else {
-+ printk(KERN_ERR DRIVER_NAME "pci_probe failed\n");
++ printk(KERN_ERR DRIVER_NAME ": pci_probe failed\n");
+ return NULL;
+ }
+ return my_dev;
@@ -480,7 +480,7 @@
+
+ atir_minor = lirc_register_driver(&atir_driver);
+ if (atir_minor < 0) {
-+ printk(KERN_ERR DRIVER_NAME "failed to register driver!\n");
++ printk(KERN_ERR DRIVER_NAME ": failed to register driver!\n");
+ return atir_minor;
+ }
+ dprintk("driver is registered on minor %d\n", atir_minor);
@@ -499,7 +499,7 @@
+{
+ pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400);
+ if (pci_addr_lin == 0) {
-+ printk(KERN_INFO DRIVER_NAME "pci mem must be mapped\n");
++ printk(KERN_INFO DRIVER_NAME ": pci mem must be mapped\n");
+ return 0;
+ }
+ return 1;
@@ -723,10 +723,10 @@
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
new file mode 100644
-index 0000000..dddd999
+index 0000000..6829268
--- /dev/null
+++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,853 @@
+@@ -0,0 +1,848 @@
+/*
+ * LIRC base driver
+ *
@@ -890,6 +890,7 @@
+
+
+static struct file_operations fops = {
++ .owner = THIS_MODULE,
+ .read = lirc_dev_fop_read,
+ .write = lirc_dev_fop_write,
+ .poll = lirc_dev_fop_poll,
@@ -899,7 +900,6 @@
+#endif
+ .open = lirc_dev_fop_open,
+ .release = lirc_dev_fop_close,
-+ .owner = THIS_MODULE,
+};
+
+static int lirc_cdev_add(struct irctl *ir)
@@ -1182,11 +1182,6 @@
+ goto error;
+ }
+
-+ /* there is no need for locking here because ir->open is 0
-+ * and lirc_thread isn't using buffer
-+ * drivers which use irq's should allocate them on set_use_inc,
-+ * so there should be no problem with those either.
-+ */
+ lirc_buffer_clear(ir->buf);
+
+ if (ir->d.owner != NULL && try_module_get(ir->d.owner)) {
@@ -1582,7 +1577,7 @@
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/input/lirc/lirc_dev.h b/drivers/input/lirc/lirc_dev.h
new file mode 100644
-index 0000000..b12d519
+index 0000000..41d0d04
--- /dev/null
+++ b/drivers/input/lirc/lirc_dev.h
@@ -0,0 +1,180 @@
@@ -1624,7 +1619,7 @@
+ else
+ WARN(1, "calling lirc_buffer_clear on an uninitialized lirc_buffer\n");
+}
-+static int lirc_buffer_init(struct lirc_buffer *buf,
++static inline int lirc_buffer_init(struct lirc_buffer *buf,
+ unsigned int chunk_size,
+ unsigned int size)
+{
@@ -1637,33 +1632,33 @@
+ return -ENOMEM;
+ return 0;
+}
-+static void lirc_buffer_free(struct lirc_buffer *buf)
++static inline void lirc_buffer_free(struct lirc_buffer *buf)
+{
+ if (buf->fifo)
+ kfifo_free(buf->fifo);
+ else
+ WARN(1, "calling lirc_buffer_free on an uninitialized lirc_buffer\n");
+}
-+static int lirc_buffer_full(struct lirc_buffer *buf)
++static inline int lirc_buffer_full(struct lirc_buffer *buf)
+{
-+ return kfifo_len(buf->fifo) == buf->fifo->size;
++ return kfifo_len(buf->fifo) == buf->size * buf->chunk_size;
+}
-+static int lirc_buffer_empty(struct lirc_buffer *buf)
++static inline int lirc_buffer_empty(struct lirc_buffer *buf)
+{
+ return !kfifo_len(buf->fifo);
+}
-+static int lirc_buffer_available(struct lirc_buffer *buf)
++static inline int lirc_buffer_available(struct lirc_buffer *buf)
+{
-+ return (buf->size - kfifo_len(buf->fifo)) / buf->chunk_size;
++ return buf->size - (kfifo_len(buf->fifo) / buf->chunk_size);
+}
+
-+static void lirc_buffer_read(struct lirc_buffer *buf,
++static inline void lirc_buffer_read(struct lirc_buffer *buf,
+ unsigned char *dest)
+{
-+ if (kfifo_len(buf->fifo) > buf->chunk_size)
++ if (kfifo_len(buf->fifo) >= buf->chunk_size)
+ kfifo_get(buf->fifo, dest, buf->chunk_size);
+}
-+static void lirc_buffer_write(struct lirc_buffer *buf,
++static inline void lirc_buffer_write(struct lirc_buffer *buf,
+ unsigned char *orig)
+{
+ kfifo_put(buf->fifo, orig, buf->chunk_size);
@@ -6135,10 +6130,10 @@
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
new file mode 100644
-index 0000000..2e94699
+index 0000000..12d9723
--- /dev/null
+++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,747 @@
+@@ -0,0 +1,749 @@
+/*
+ * USB Microsoft IR Transceiver driver - 0.2
+ *
@@ -6752,6 +6747,8 @@
+ (udev, endpoint->bEndpointAddress),
+ dev->bulk_out_buffer, buffer_size,
+ mceusb_write_bulk_callback, dev);
++ dev->write_urb->transfer_dma = dev->dma_out;
++ dev->write_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+ }
+ }
+
@@ -6888,10 +6885,10 @@
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
new file mode 100644
-index 0000000..0551adf
+index 0000000..4c24b79
--- /dev/null
+++ b/drivers/input/lirc/lirc_mceusb2.c
-@@ -0,0 +1,1099 @@
+@@ -0,0 +1,1098 @@
+/*
+ * LIRC driver for Philips eHome USB Infrared Transceiver
+ * and the Microsoft MCE 2005 Remote Control
@@ -7196,8 +7193,7 @@
+ usb_fill_int_urb(async_urb, ir->usbdev,
+ usb_sndintpipe(ir->usbdev,
+ ep->bEndpointAddress),
-+ async_buf,
-+ size,
++ async_buf, size,
+ (usb_complete_t) usb_async_callback,
+ ir, ep->bInterval);
+
@@ -9677,7 +9673,7 @@
+module_exit(sasem_exit);
diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
new file mode 100644
-index 0000000..3e9292e
+index 0000000..01cc8b7
--- /dev/null
+++ b/drivers/input/lirc/lirc_serial.c
@@ -0,0 +1,1321 @@
@@ -10562,7 +10558,7 @@
+ /* If pin is high, then this must be an active low receiver. */
+ if (sense == -1) {
+ /* wait 1/2 sec for the power supply */
-+ msleep(jiffies_to_msecs(HZ/2));
++ msleep(500);
+
+ /*
+ * probe 9 times every 0.04s, collect "votes" for
@@ -10575,7 +10571,7 @@
+ nlow++;
+ else
+ nhigh++;
-+ msleep(jiffies_to_msecs(HZ/25));
++ msleep(40);
+ }
+ sense = (nlow >= nhigh ? 1 : 0);
+ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active "
@@ -10592,11 +10588,6 @@
+ int result;
+ unsigned long flags;
+
-+ /* Init read buffer. */
-+ result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN);
-+ if (result < 0)
-+ return -ENOMEM;
-+
+ /* initialize timestamp */
+ do_gettimeofday(&lasttv);
+
@@ -10846,6 +10837,11 @@
+{
+ int result;
+
++ /* Init read buffer. */
++ result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN);
++ if (result < 0)
++ return -ENOMEM;
++
+ result = platform_driver_register(&lirc_serial_driver);
+ if (result) {
+ printk("lirc register returned %d\n", result);
@@ -11004,7 +11000,7 @@
+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..306c77a
+index 0000000..6c64072
--- /dev/null
+++ b/drivers/input/lirc/lirc_sir.c
@@ -0,0 +1,1294 @@
@@ -11221,12 +11217,12 @@
+ PPSR &= ~PPC_TXD2;
+}
+#else
-+static unsigned int sinp(int offset)
++static inline unsigned int sinp(int offset)
+{
+ return inb(io + offset);
+}
+
-+static void soutp(int offset, int value)
++static inline void soutp(int offset, int value)
+{
+ outb(value, io + offset);
+}
@@ -12304,10 +12300,10 @@
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
new file mode 100644
-index 0000000..6db4310
+index 0000000..d1ce354
--- /dev/null
+++ b/drivers/input/lirc/lirc_streamzap.c
-@@ -0,0 +1,775 @@
+@@ -0,0 +1,777 @@
+/*
+ * Streamzap Remote Control driver
+ *
@@ -12852,6 +12848,8 @@
+ usb_rcvintpipe(udev, sz->endpoint->bEndpointAddress),
+ sz->buf_in, sz->buf_in_len, usb_streamzap_irq, sz,
+ sz->endpoint->bInterval);
++ sz->urb_in->transfer_dma = sz->dma_in;
++ sz->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+
+ if (udev->descriptor.iManufacturer
+ && usb_string(udev, udev->descriptor.iManufacturer,
More information about the fedora-extras-commits
mailing list