rpms/kernel/devel kernel.spec, 1.669, 1.670 linux-2.6-lirc.patch, 1.5, 1.6
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Mon Jun 2 20:20:43 UTC 2008
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6070
Modified Files:
kernel.spec linux-2.6-lirc.patch
Log Message:
* Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com>
- Updated lirc patch with latest upstream changes and 2.6.26 compat
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -r1.669 -r1.670
--- kernel.spec 2 Jun 2008 18:54:59 -0000 1.669
+++ kernel.spec 2 Jun 2008 20:19:48 -0000 1.670
@@ -1779,6 +1779,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com>
+- Updated lirc patch with latest upstream changes and 2.6.26 compat
+
* Mon Jun 02 2008 John W. Linville <linville at redhat.com>
- Revert misguided wireless.h "fix" from upstream
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-lirc.patch 12 Feb 2008 06:18:04 -0000 1.5
+++ linux-2.6-lirc.patch 2 Jun 2008 20:19:48 -0000 1.6
@@ -1,8 +1,8 @@
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
-index 9dea14d..d84ac4a 100644
+index 63512d9..de4b170 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
-@@ -173,5 +173,7 @@ source "drivers/input/gameport/Kconfig"
+@@ -161,5 +161,7 @@ source "drivers/input/gameport/Kconfig"
endmenu
@@ -11,16 +11,14 @@
endmenu
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
-index 2ae87b1..24bdec1 100644
+index 99af903..78b0420 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
-@@ -21,5 +21,6 @@ obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
- obj-$(CONFIG_INPUT_TABLET) += tablet/
+@@ -22,3 +22,4 @@ obj-$(CONFIG_INPUT_TABLET) += tablet/
obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
obj-$(CONFIG_INPUT_MISC) += misc/
-+obj-$(CONFIG_INPUT_LIRC) += lirc/
- obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o
++obj-$(CONFIG_INPUT_LIRC) += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..138e58a
@@ -1248,10 +1246,10 @@
+
diff --git a/drivers/input/lirc/kcompat.h b/drivers/input/lirc/kcompat.h
new file mode 100644
-index 0000000..7792a88
+index 0000000..da2e7eb
--- /dev/null
+++ b/drivers/input/lirc/kcompat.h
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,152 @@
+/* $Id$ */
+
+#ifndef _KCOMPAT_H
@@ -1269,12 +1267,14 @@
+
+
+
-+#define lirc_class_device_create class_device_create
++#define lirc_device_create device_create
+#define LIRC_DEVFS_PREFIX
+
+
+typedef struct class lirc_class_t;
+
++#define lirc_device_destroy device_destroy
++
+
+
+#ifndef LIRC_DEVFS_PREFIX
@@ -1404,10 +1404,10 @@
+#endif /* _KCOMPAT_H */
diff --git a/drivers/input/lirc/lirc.h b/drivers/input/lirc/lirc.h
new file mode 100644
-index 0000000..ee76bc9
+index 0000000..accd2cd
--- /dev/null
+++ b/drivers/input/lirc/lirc.h
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,102 @@
+/* $Id$ */
+
+#ifndef _LINUX_LIRC_H
@@ -1466,6 +1466,7 @@
+
+#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
+#define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000
++#define LIRC_CAN_GET_REC_RESOLUTION 0x20000000
+
+#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
+#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
@@ -3886,7 +3887,7 @@
+#endif
diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
new file mode 100644
-index 0000000..cbbc436
+index 0000000..1d5706f
--- /dev/null
+++ b/drivers/input/lirc/lirc_dev.c
@@ -0,0 +1,827 @@
@@ -4000,7 +4001,7 @@
+#ifdef LIRC_HAVE_DEVFS_26
+ devfs_remove(DEV_LIRC "/%u", ir->p.minor);
+#endif
-+ class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
++ lirc_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
+
+ if (ir->buf != ir->p.rbuf) {
+ lirc_buffer_free(ir->buf);
@@ -4221,9 +4222,9 @@
+ S_IFCHR|S_IRUSR|S_IWUSR,
+ DEV_LIRC "/%u", ir->p.minor);
+#endif
-+ (void) lirc_class_device_create(lirc_class, NULL,
-+ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
-+ ir->p.dev, "lirc%u", ir->p.minor);
++ (void) lirc_device_create(lirc_class, ir->p.dev,
++ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
++ "lirc%u", ir->p.minor);
+
+ if (p->sample_rate || p->get_queue) {
+ /* try to fire up polling thread */
@@ -4249,7 +4250,7 @@
+ return minor;
+
+out_sysfs:
-+ class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
++ lirc_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
+#ifdef LIRC_HAVE_DEVFS_26
+ devfs_remove(DEV_LIRC "/%i", ir->p.minor);
+#endif
@@ -4989,10 +4990,10 @@
+#endif
diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
new file mode 100644
-index 0000000..ed1092b
+index 0000000..6e47d53
--- /dev/null
+++ b/drivers/input/lirc/lirc_i2c.c
-@@ -0,0 +1,671 @@
+@@ -0,0 +1,668 @@
+/* $Id$ */
+
+/*
@@ -5324,12 +5325,9 @@
+static int set_use_inc(void *data)
+{
+ struct IR *ir = data;
-+ int ret;
+
+ /* lock bttv in memory while /dev/lirc is in use */
-+ ret = i2c_use_client(&ir->c);
-+ if (ret != 0)
-+ return ret;
++ i2c_use_client(&ir->c);
+
+ MOD_INC_USE_COUNT;
+ return 0;
@@ -9503,12 +9501,12 @@
+EXPORT_NO_SYMBOLS;
diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
new file mode 100644
-index 0000000..85dc1ce
+index 0000000..9e927a4
--- /dev/null
+++ b/drivers/input/lirc/lirc_mceusb2.c
-@@ -0,0 +1,1042 @@
+@@ -0,0 +1,1058 @@
+/*
-+ * LIRC driver for Philips eHome USB Infrared Transciever
++ * LIRC driver for Philips eHome USB Infrared Transceiver
+ * and the Microsoft MCE 2005 Remote Control
+ *
+ * (C) by Martin A. Blatter <martin_a_blatter at yahoo.com>
@@ -9567,7 +9565,7 @@
+#define DRIVER_VERSION "$Revision$"
+#define DRIVER_AUTHOR "Daniel Melander <lirc at rajidae.se>, " \
+ "Martin Blatter <martin_a_blatter at yahoo.com>"
-+#define DRIVER_DESC "Philips eHome USB IR Transciever and Microsoft " \
++#define DRIVER_DESC "Philips eHome USB IR Transceiver and Microsoft " \
+ "MCE 2005 Remote Control driver for LIRC"
+#define DRIVER_NAME "lirc_mceusb2"
+
@@ -9587,6 +9585,7 @@
+#define MCE_PULSE_BIT 0x80 /* Pulse bit, MSB set == PULSE else SPACE */
+#define MCE_PULSE_MASK 0x7F /* Pulse mask */
+#define MCE_MAX_PULSE_LENGTH 0x7F /* Longest transmittable pulse symbol */
++#define MCE_PACKET_LENGTH_MASK 0x7F /* Pulse mask */
+
+
+/* module parameters */
@@ -9621,6 +9620,7 @@
+#define VENDOR_TATUNG 0x1460
+#define VENDOR_GATEWAY 0x107b
+#define VENDOR_SHUTTLE 0x1308
++#define VENDOR_SHUTTLE2 0x051c
+#define VENDOR_MITSUMI 0x03ee
+#define VENDOR_TOPSEED 0x1784
+#define VENDOR_RICAVISION 0x179d
@@ -9630,12 +9630,15 @@
+#define VENDOR_MICROSOFT 0x045e
+#define VENDOR_FORMOSA 0x147a
+#define VENDOR_FINTEK 0x1934
++#define VENDOR_PINNACLE 0x2304
+
+static struct usb_device_id usb_remote_table [] = {
-+ /* Philips eHome Infrared Transciever */
++ /* Philips eHome Infrared Transceiver */
+ { USB_DEVICE(VENDOR_PHILIPS, 0x0815) },
-+ /* Philips Infrared Transciever - HP branded */
++ /* Philips Infrared Transceiver - HP branded */
+ { USB_DEVICE(VENDOR_PHILIPS, 0x060c) },
++ /* Philips SRM5100 */
++ { USB_DEVICE(VENDOR_PHILIPS, 0x060d) },
+ /* SMK/Toshiba G83C0004D410 */
+ { USB_DEVICE(VENDOR_SMK, 0x031d) },
+ /* SMK eHome Infrared Transceiver (Sony VAIO) */
@@ -9646,6 +9649,8 @@
+ { USB_DEVICE(VENDOR_TATUNG, 0x9150) },
+ /* Shuttle eHome Infrared Transceiver */
+ { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) },
++ /* Shuttle eHome Infrared Transceiver */
++ { USB_DEVICE(VENDOR_SHUTTLE2, 0xc001) },
+ /* Gateway eHome Infrared Transceiver */
+ { USB_DEVICE(VENDOR_GATEWAY, 0x3009) },
+ /* Mitsumi */
@@ -9672,8 +9677,12 @@
+ { USB_DEVICE(VENDOR_FORMOSA, 0xe015) },
+ /* Formosa aim / Trust MCE Infrared Receiver */
+ { USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
++ /* Formosa Industrial Computing / Beanbag Emulation Device */
++ { USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
+ /* Fintek eHome Infrared Transceiver */
+ { USB_DEVICE(VENDOR_FINTEK, 0x0602) },
++ /* Pinnacle Remote Kit */
++ { USB_DEVICE(VENDOR_PINNACLE, 0x0225) },
+ /* Terminating entry */
+ { }
+};
@@ -9943,9 +9952,11 @@
+ /* success */
+ case SUCCESS:
+ for (i = 0; i < buf_len; i++) {
-+ /* decode mce packets on the form (84),AA,BB,CC,DD */
++ /* decode mce packets of the form (84),AA,BB,CC,DD */
+ switch (ir->buf_in[i]) {
++
+ /* data headers */
++ case 0x90: /* used Pinnacle Remote Kit */
+ case 0x8F:
+ case 0x8E:
+ case 0x8D:
@@ -9963,7 +9974,8 @@
+ case 0x81:
+ case 0x80:
+ /* decode packet data */
-+ packet_len = ir->buf_in[i] & MCE_PULSE_MASK;
++ packet_len = ir->buf_in[i] &
++ MCE_PACKET_LENGTH_MASK;
+ for (j = 1;
+ j <= packet_len && (i+j < buf_len);
+ j++) {
@@ -10132,7 +10144,9 @@
+ (ir->usbdev->descriptor.idVendor == VENDOR_TOPSEED &&
+ (ir->usbdev->descriptor.idProduct == 0x0001 ||
+ ir->usbdev->descriptor.idProduct == 0x0007 ||
-+ ir->usbdev->descriptor.idProduct == 0x0008)))
++ ir->usbdev->descriptor.idProduct == 0x0008)) ||
++ (ir->usbdev->descriptor.idVendor == VENDOR_PINNACLE &&
++ (ir->usbdev->descriptor.idProduct == 0x0225)))
+ ir->transmitter_mask = mask;
+ else
+ /* The mask begins at 0x02 and has an inverted
More information about the fedora-extras-commits
mailing list