rpms/kernel/devel kernel.spec, 1.2080, 1.2081 lirc-staging-2.6.36.patch, 1.2, 1.3
Jarod Wilson
jwilson at fedoraproject.org
Sun Jul 18 05:42:21 UTC 2010
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11502
Modified Files:
kernel.spec lirc-staging-2.6.36.patch
Log Message:
* Sun Jul 18 2010 Jarod Wilson <jarod at redhat.com> 2.6.35-0.44.rc5.git1
- Oops, minor oversight when moving lirc bits into staging resulted
in the modules themselves not getting built. Fix that. Try #2.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2080
retrieving revision 1.2081
diff -u -p -r1.2080 -r1.2081
--- kernel.spec 18 Jul 2010 04:43:36 -0000 1.2080
+++ kernel.spec 18 Jul 2010 05:42:16 -0000 1.2081
@@ -1859,7 +1859,7 @@ fi
# || ||
%changelog
-* Sun Jul 18 2010 Jarod Wilson <jarod at redhat.com> 2.6.35-0.43.rc5.git1
+* Sun Jul 18 2010 Jarod Wilson <jarod at redhat.com> 2.6.35-0.44.rc5.git1
- Oops, minor oversight when moving lirc bits into staging resulted
in the modules themselves not getting built. Fix that.
lirc-staging-2.6.36.patch:
Kconfig | 2
Makefile | 1
lirc/Kconfig | 110 +++
lirc/Makefile | 19
lirc/TODO | 8
lirc/lirc_bt829.c | 383 +++++++++++++
lirc/lirc_ene0100.c | 646 ++++++++++++++++++++++
lirc/lirc_ene0100.h | 169 +++++
lirc/lirc_i2c.c | 536 ++++++++++++++++++
lirc/lirc_igorplugusb.c | 555 +++++++++++++++++++
lirc/lirc_imon.c | 1057 ++++++++++++++++++++++++++++++++++++
lirc/lirc_it87.c | 1021 +++++++++++++++++++++++++++++++++++
lirc/lirc_it87.h | 116 ++++
lirc/lirc_ite8709.c | 542 ++++++++++++++++++
lirc/lirc_parallel.c | 708 ++++++++++++++++++++++++
lirc/lirc_parallel.h | 26
lirc/lirc_sasem.c | 933 ++++++++++++++++++++++++++++++++
lirc/lirc_serial.c | 1318 +++++++++++++++++++++++++++++++++++++++++++++
lirc/lirc_sir.c | 1283 ++++++++++++++++++++++++++++++++++++++++++++
lirc/lirc_streamzap.c | 821 ++++++++++++++++++++++++++++
lirc/lirc_ttusbir.c | 397 +++++++++++++
lirc/lirc_zilog.c | 1387 ++++++++++++++++++++++++++++++++++++++++++++++++
22 files changed, 12038 insertions(+)
Index: lirc-staging-2.6.36.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-staging-2.6.36.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc-staging-2.6.36.patch 18 Jul 2010 04:43:36 -0000 1.2
+++ lirc-staging-2.6.36.patch 18 Jul 2010 05:42:18 -0000 1.3
@@ -11,16 +11,16 @@
drivers/staging/lirc/lirc_imon.c | 1057 +++++++++++++++++++++++
drivers/staging/lirc/lirc_it87.c | 1021 +++++++++++++++++++++++
drivers/staging/lirc/lirc_it87.h | 116 +++
- drivers/staging/lirc/lirc_ite8709.c | 540 ++++++++++++
- drivers/staging/lirc/lirc_parallel.c | 709 ++++++++++++++++
+ drivers/staging/lirc/lirc_ite8709.c | 542 ++++++++++++
+ drivers/staging/lirc/lirc_parallel.c | 708 ++++++++++++++++
drivers/staging/lirc/lirc_parallel.h | 26 +
- drivers/staging/lirc/lirc_sasem.c | 935 +++++++++++++++++++++
- drivers/staging/lirc/lirc_serial.c | 1317 +++++++++++++++++++++++++++++
+ drivers/staging/lirc/lirc_sasem.c | 933 +++++++++++++++++++++
+ drivers/staging/lirc/lirc_serial.c | 1318 +++++++++++++++++++++++++++++
drivers/staging/lirc/lirc_sir.c | 1283 ++++++++++++++++++++++++++++
drivers/staging/lirc/lirc_streamzap.c | 821 ++++++++++++++++++
drivers/staging/lirc/lirc_ttusbir.c | 397 +++++++++
- drivers/staging/lirc/lirc_zilog.c | 1388 +++++++++++++++++++++++++++++++
- 22 files changed, 12039 insertions(+), 0 deletions(-)
+ drivers/staging/lirc/lirc_zilog.c | 1387 +++++++++++++++++++++++++++++++
+ 22 files changed, 12038 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 984a754..9296517 100644
@@ -45,7 +45,7 @@ index 9fa2513..9e9b068 100644
+obj-$(CONFIG_LIRC_STAGING) += lirc/
diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig
new file mode 100644
-index 0000000..7e01744
+index 0000000..968c2ad
--- /dev/null
+++ b/drivers/staging/lirc/Kconfig
@@ -0,0 +1,110 @@
@@ -1958,7 +1958,7 @@ index 0000000..6df2c0e
+module_exit(lirc_i2c_exit);
diff --git a/drivers/staging/lirc/lirc_igorplugusb.c b/drivers/staging/lirc/lirc_igorplugusb.c
new file mode 100644
-index 0000000..afbc138
+index 0000000..bce600e
--- /dev/null
+++ b/drivers/staging/lirc/lirc_igorplugusb.c
@@ -0,0 +1,555 @@
@@ -3582,7 +3582,7 @@ index 0000000..5393ae4
+module_exit(imon_exit);
diff --git a/drivers/staging/lirc/lirc_it87.c b/drivers/staging/lirc/lirc_it87.c
new file mode 100644
-index 0000000..89902e8
+index 0000000..785714c
--- /dev/null
+++ b/drivers/staging/lirc/lirc_it87.c
@@ -0,0 +1,1021 @@
@@ -3715,8 +3715,7 @@ index 0000000..89902e8
+ size_t count, loff_t *ppos);
+static ssize_t lirc_write(struct file *file, const char *buf,
+ size_t n, loff_t *pos);
-+static long lirc_ioctl(struct file *filep,
-+ unsigned int cmd, unsigned long arg);
++static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
+static void add_read_queue(int flag, unsigned long val);
+static int init_chrdev(void);
+static void drop_chrdev(void);
@@ -3796,11 +3795,13 @@ index 0000000..89902e8
+ size_t n, loff_t *pos)
+{
+ int i = 0;
++ unsigned char data_buf[WBUF_LEN];
+
-+ if (n % sizeof(int) || (n / sizeof(int)) > WBUF_LEN)
++ if (n % sizeof(int) || (n > sizeof(int) * WBUF_LEN))
+ return -EINVAL;
-+ if (copy_from_user(tx_buf, buf, n))
++ if (copy_from_user(data_buf, buf, n))
+ return -EFAULT;
++ memcpy(tx_buf, data_buf, n);
+ n /= sizeof(int);
+ init_send();
+ while (1) {
@@ -3820,8 +3821,7 @@ index 0000000..89902e8
+}
+
+
-+static long lirc_ioctl(struct file *filep,
-+ unsigned int cmd, unsigned long arg)
++static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
+{
+ int retval = 0;
+ unsigned long value = 0;
@@ -4731,10 +4731,10 @@ index 0000000..cf021c8
+/********************************* ITE IT87xx ************************/
diff --git a/drivers/staging/lirc/lirc_ite8709.c b/drivers/staging/lirc/lirc_ite8709.c
new file mode 100644
-index 0000000..90751ed
+index 0000000..9352f45
--- /dev/null
+++ b/drivers/staging/lirc/lirc_ite8709.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,542 @@
+/*
+ * LIRC driver for ITE8709 CIR port
+ *
@@ -5259,15 +5259,17 @@ index 0000000..90751ed
+ .id_table = pnp_dev_table,
+};
+
-+int init_module(void)
++static int __init ite8709_init_module(void)
+{
+ return pnp_register_driver(&ite8709_pnp_driver);
+}
++module_init(ite8709_init_module);
+
-+void cleanup_module(void)
++static void __exit ite8709_cleanup_module(void)
+{
+ pnp_unregister_driver(&ite8709_pnp_driver);
+}
++module_exit(ite8709_cleanup_module);
+
+MODULE_DESCRIPTION("LIRC driver for ITE8709 CIR port");
+MODULE_AUTHOR("Grégory Lardière");
@@ -5277,10 +5279,10 @@ index 0000000..90751ed
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c
new file mode 100644
-index 0000000..62a8388
+index 0000000..9e86646
--- /dev/null
+++ b/drivers/staging/lirc/lirc_parallel.c
-@@ -0,0 +1,709 @@
+@@ -0,0 +1,708 @@
+/*
+ * lirc_parallel.c
+ *
@@ -5747,8 +5749,7 @@ index 0000000..62a8388
+ return 0;
+}
+
-+static long lirc_ioctl(struct file *filep, unsigned int cmd,
-+ unsigned long arg)
++static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
+{
+ int result;
+ unsigned long features = LIRC_CAN_SET_TRANSMITTER_MASK |
@@ -6024,10 +6025,10 @@ index 0000000..4bed6af
+#endif
diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/lirc/lirc_sasem.c
new file mode 100644
-index 0000000..f5d01d6
+index 0000000..c67b06e
--- /dev/null
+++ b/drivers/staging/lirc/lirc_sasem.c
-@@ -0,0 +1,935 @@
+@@ -0,0 +1,933 @@
+/*
+ * lirc_sasem.c - USB remote support for LIRC
+ * Version 0.5
@@ -6101,8 +6102,7 @@ index 0000000..f5d01d6
+
+/* VFD file_operations function prototypes */
+static int vfd_open(struct inode *inode, struct file *file);
-+static long vfd_ioctl(struct file *file,
-+ unsigned cmd, unsigned long arg);
++static long vfd_ioctl(struct file *file, unsigned cmd, unsigned long arg);
+static int vfd_close(struct inode *inode, struct file *file);
+static ssize_t vfd_write(struct file *file, const char *buf,
+ size_t n_bytes, loff_t *pos);
@@ -6275,8 +6275,7 @@ index 0000000..f5d01d6
+ * Called when the VFD device (e.g. /dev/usb/lcd)
+ * is closed by the application.
+ */
-+static long vfd_ioctl(struct file *file,
-+ unsigned cmd, unsigned long arg)
++static long vfd_ioctl(struct file *file, unsigned cmd, unsigned long arg)
+{
+ struct sasem_context *context = NULL;
+
@@ -6965,10 +6964,10 @@ index 0000000..f5d01d6
+module_exit(sasem_exit);
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
new file mode 100644
-index 0000000..73d4677
+index 0000000..60ce1d1
--- /dev/null
+++ b/drivers/staging/lirc/lirc_serial.c
-@@ -0,0 +1,1316 @@
+@@ -0,0 +1,1318 @@
+/*
+ * lirc_serial.c
+ *
@@ -7931,6 +7930,7 @@ index 0000000..73d4677
+ int i, count;
+ unsigned long flags;
+ long delta = 0;
++ unsigned char data_buf[WBUF_LEN];
+
+ if (!(hardware[type].features&LIRC_CAN_SEND_PULSE))
+ return -EBADF;
@@ -7938,10 +7938,11 @@ index 0000000..73d4677
+ if (n % sizeof(int))
+ return -EINVAL;
+ count = n / sizeof(int);
-+ if (count > WBUF_LEN || count % 2 == 0)
++ if (n > (WBUF_LEN * sizeof(int)) || count % 2 == 0)
+ return -EINVAL;
-+ if (copy_from_user(wbuf, buf, n))
++ if (copy_from_user(data_buf, buf, n))
+ return -EFAULT;
++ memcpy(wbuf, data_buf, n);
+ spin_lock_irqsave(&hardware[type].lock, flags);
+ if (type == LIRC_IRDEO) {
+ /* DTR, RTS down */
@@ -8287,10 +8288,10 @@ index 0000000..73d4677
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c
new file mode 100644
-index 0000000..fee5f9f
+index 0000000..8cef4bc
--- /dev/null
+++ b/drivers/staging/lirc/lirc_sir.c
-@@ -0,0 +1,1281 @@
+@@ -0,0 +1,1283 @@
+/*
+ * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
+ *
@@ -8588,11 +8589,13 @@ index 0000000..fee5f9f
+{
+ unsigned long flags;
+ int i;
++ unsigned char data_buf[WBUF_LEN];
+
-+ if (n % sizeof(int) || (n / sizeof(int)) > WBUF_LEN)
++ if (n % sizeof(int) || (n > WBUF_LEN * sizeof(int)))
+ return -EINVAL;
-+ if (copy_from_user(tx_buf, buf, n))
++ if (copy_from_user(data_buf, buf, n))
+ return -EFAULT;
++ memcpy(tx_buf, data_buf, n);
+ i = 0;
+ n /= sizeof(int);
+#ifdef LIRC_ON_SA1100
@@ -9574,7 +9577,7 @@ index 0000000..fee5f9f
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/staging/lirc/lirc_streamzap.c b/drivers/staging/lirc/lirc_streamzap.c
new file mode 100644
-index 0000000..b80e246
+index 0000000..5b46ac4
--- /dev/null
+++ b/drivers/staging/lirc/lirc_streamzap.c
@@ -0,0 +1,821 @@
@@ -9732,8 +9735,8 @@ index 0000000..b80e246
+static void usb_streamzap_irq(struct urb *urb);
+static int streamzap_use_inc(void *data);
+static void streamzap_use_dec(void *data);
-+static long streamzap_ioctl(struct file *filep,
-+ unsigned int cmd, unsigned long arg);
++static long streamzap_ioctl(struct file *filep, unsigned int cmd,
++ unsigned long arg);
+static int streamzap_suspend(struct usb_interface *intf, pm_message_t message);
+static int streamzap_resume(struct usb_interface *intf);
+
@@ -10250,8 +10253,8 @@ index 0000000..b80e246
+ sz->in_use--;
+}
+
-+static long streamzap_ioctl(struct file *filep,
-+ unsigned int cmd, unsigned long arg)
++static long streamzap_ioctl(struct file *filep, unsigned int cmd,
++ unsigned long arg)
+{
+ int result = 0;
+ int val;
@@ -10804,10 +10807,10 @@ index 0000000..1f1da47
+module_exit(ttusbir_exit_module);
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
new file mode 100644
-index 0000000..c3d9ca9
+index 0000000..1b013bf
--- /dev/null
+++ b/drivers/staging/lirc/lirc_zilog.c
-@@ -0,0 +1,1388 @@
+@@ -0,0 +1,1387 @@
+/*
+ * i2c IR lirc driver for devices with zilog IR processors
+ *
@@ -11802,8 +11805,7 @@ index 0000000..c3d9ca9
+ return ret;
+}
+
-+static long ioctl(struct file *filep, unsigned int cmd,
-+ unsigned long arg)
++static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
+{
+ struct IR *ir = (struct IR *)filep->private_data;
+ int result;
More information about the scm-commits
mailing list