rpms/kernel/devel kernel.spec, 1.937, 1.938 linux-2.6-lirc.patch, 1.14, 1.15
Jarod Wilson
jwilson at fedoraproject.org
Mon Sep 8 21:58:09 UTC 2008
- Previous message (by thread): rpms/perl-Tie-ToObject/devel import.log, NONE, 1.1 perl-Tie-ToObject.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-Tie-ToObject/devel perl-Tie-ToObject.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10742
Modified Files:
kernel.spec linux-2.6-lirc.patch
Log Message:
* Mon Sep 08 2008 Jarod Wilson <jarod at redhat.com>
- Dave's lirc patch merged for upstream submission
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -r1.937 -r1.938
--- kernel.spec 8 Sep 2008 00:35:14 -0000 1.937
+++ kernel.spec 8 Sep 2008 21:57:38 -0000 1.938
@@ -604,7 +604,6 @@
Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
Patch1400: linux-2.6-smarter-relatime.patch
Patch1515: linux-2.6-lirc.patch
-Patch1516: linux-2.6-fix-lirc-ppc64.patch
# nouveau + drm fixes
Patch1811: drm-modesetting-radeon.patch
@@ -1142,7 +1141,6 @@
# http://www.lirc.org/
ApplyPatch linux-2.6-lirc.patch
-ApplyPatch linux-2.6-fix-lirc-ppc64.patch
ApplyPatch linux-2.6-e1000-ich9.patch
@@ -1746,6 +1744,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Sep 08 2008 Jarod Wilson <jarod at redhat.com>
+- Dave's lirc patch merged for upstream submission
+
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com>
- disable VGA bashing in radeon - make text reserve larger.
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-lirc.patch 5 Sep 2008 05:02:59 -0000 1.14
+++ linux-2.6-lirc.patch 8 Sep 2008 21:57:38 -0000 1.15
@@ -1,9 +1,9 @@
Linux Infrared Remote Control drivers
Signed-off-by: Jarod Wilson <jarod at redhat.com>
+Signed-off-by: Janne Grunau <j at jannau.net>
---
-
drivers/input/Kconfig | 2 +
drivers/input/Makefile | 2 +
drivers/input/lirc/Kconfig | 142 ++++
@@ -11,42 +11,70 @@
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_atiusb.c | 1321 +++++++++++++++++++++++++++++++
drivers/input/lirc/lirc_bt829.c | 388 +++++++++
- drivers/input/lirc/lirc_cmdir.c | 600 ++++++++++++++
+ drivers/input/lirc/lirc_cmdir.c | 596 ++++++++++++++
drivers/input/lirc/lirc_cmdir.h | 25 +
- drivers/input/lirc/lirc_dev.c | 812 +++++++++++++++++++
+ drivers/input/lirc/lirc_dev.c | 809 +++++++++++++++++++
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_i2c.c | 639 +++++++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c | 619 +++++++++++++++
drivers/input/lirc/lirc_imon.c | 1280 ++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c | 1004 +++++++++++++++++++++++
+ drivers/input/lirc/lirc_it87.c | 999 +++++++++++++++++++++++
drivers/input/lirc/lirc_it87.h | 116 +++
- drivers/input/lirc/lirc_ite8709.c | 548 +++++++++++++
- 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_ite8709.c | 545 +++++++++++++
+ drivers/input/lirc/lirc_mceusb.c | 890 +++++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb2.c | 1119 ++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_parallel.c | 728 +++++++++++++++++
drivers/input/lirc/lirc_parallel.h | 26 +
- 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_sasem.c | 969 +++++++++++++++++++++++
+ drivers/input/lirc/lirc_serial.c | 1312 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_sir.c | 1302 ++++++++++++++++++++++++++++++
drivers/input/lirc/lirc_streamzap.c | 795 +++++++++++++++++++
- drivers/input/lirc/lirc_ttusbir.c | 394 ++++++++++
- drivers/input/lirc/lirc_zilog.c | 1397 +++++++++++++++++++++++++++++++++
- 29 files changed, 17860 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_ttusbir.c | 400 ++++++++++
+ drivers/input/lirc/lirc_zilog.c | 1395 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17859 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/input/lirc/Kconfig
+ create mode 100644 drivers/input/lirc/Makefile
+ create mode 100644 drivers/input/lirc/commandir.c
+ create mode 100644 drivers/input/lirc/commandir.h
+ create mode 100644 drivers/input/lirc/lirc.h
+ create mode 100644 drivers/input/lirc/lirc_atiusb.c
+ create mode 100644 drivers/input/lirc/lirc_bt829.c
+ create mode 100644 drivers/input/lirc/lirc_cmdir.c
+ create mode 100644 drivers/input/lirc/lirc_cmdir.h
+ create mode 100644 drivers/input/lirc/lirc_dev.c
+ create mode 100644 drivers/input/lirc/lirc_dev.h
+ create mode 100644 drivers/input/lirc/lirc_i2c.c
+ create mode 100644 drivers/input/lirc/lirc_igorplugusb.c
+ create mode 100644 drivers/input/lirc/lirc_imon.c
+ create mode 100644 drivers/input/lirc/lirc_it87.c
+ create mode 100644 drivers/input/lirc/lirc_it87.h
+ create mode 100644 drivers/input/lirc/lirc_ite8709.c
+ create mode 100644 drivers/input/lirc/lirc_mceusb.c
+ create mode 100644 drivers/input/lirc/lirc_mceusb2.c
+ create mode 100644 drivers/input/lirc/lirc_parallel.c
+ create mode 100644 drivers/input/lirc/lirc_parallel.h
+ create mode 100644 drivers/input/lirc/lirc_sasem.c
+ create mode 100644 drivers/input/lirc/lirc_serial.c
+ create mode 100644 drivers/input/lirc/lirc_sir.c
+ create mode 100644 drivers/input/lirc/lirc_streamzap.c
+ create mode 100644 drivers/input/lirc/lirc_ttusbir.c
+ create mode 100644 drivers/input/lirc/lirc_zilog.c
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
-index 5f9d860..747633c 100644
+index 5f9d860..2ba0904 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
-@@ -182,5 +182,7 @@ source "drivers/input/gameport/Kconfig"
+@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
- endmenu
+ source "drivers/input/touchscreen/Kconfig"
+source "drivers/input/lirc/Kconfig"
+
- endmenu
+ source "drivers/input/misc/Kconfig"
+ endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 98c4f9a..6a1049b 100644
--- a/drivers/input/Makefile
@@ -59,7 +87,7 @@
+obj-$(CONFIG_INPUT_LIRC) += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
-index 0000000..44ad7cb
+index 0000000..2297792
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,142 @@
@@ -79,34 +107,34 @@
+
+config LIRC_DEV
+ tristate "LIRC device loadable module support"
-+ default m
++ default n
+ help
+ LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_ATIUSB
+ tristate "ATI RF USB Receiver support"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the ATI USB RF remote receiver
+
+config LIRC_BT829
+ tristate "BT829 based hardware"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the IR interface on BT829-based hardware
+
+config LIRC_CMDIR
+ tristate "CommandIR USB Transceiver"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the CommandIR USB Transceiver
+
+config LIRC_I2C
+ tristate "I2C Based IR Receivers"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for I2C-based IR receivers, such as those commonly
@@ -114,100 +142,100 @@
+
+config LIRC_IGORPLUGUSB
+ tristate "Igor Cesko's USB IR Receiver"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+ tristate "Soundgraph IMON Receiver"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+ tristate "ITE IT87XX CIR Port Receiver"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+ tristate "ITE8709 CIR Port Receiver"
-+ default m
-+ depends on LIRC_DEV
++ default n
++ depends on LIRC_DEV && PNP
+ help
+ Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+ tristate "Microsoft Media Center Ed. Receiver, v1"
-+ default m
++ default n
+ 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
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Microsoft Media Center Ed. Receiver, v2
+
-+config LIRC_ZILOG
-+ tristate "Zilog/Hauppauge IR Transmitter"
-+ default m
-+ depends on LIRC_DEV
-+ help
-+ Driver for the Zilog/Hauppauge IR Transmitter, found on
-+ PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
-+
+config LIRC_PARALLEL
+ tristate "Homebrew Parallel Port Receiver"
-+ default m
++ default n
+ depends on LIRC_DEV && !SMP
+ help
+ Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+ tristate "Sasem USB IR Remote"
-+ default m
++ default n
+ 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
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for Homebrew Serial Port Receivers
+
+config LIRC_SIR
+ tristate "Built-in SIR IrDA port"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+ tristate "Streamzap PC Receiver"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+ tristate "Technotrend USB IR Receiver"
-+ default m
++ default n
+ depends on LIRC_DEV
+ help
+ Driver for the Technotrend USB IR Receiver
+
++config LIRC_ZILOG
++ tristate "Zilog/Hauppauge IR Transmitter"
++ default n
++ depends on LIRC_DEV
++ help
++ Driver for the Zilog/Hauppauge IR Transmitter, found on
++ PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
++
+endif
diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
new file mode 100644
-index 0000000..506285d
+index 0000000..044ea8e
--- /dev/null
+++ b/drivers/input/lirc/Makefile
@@ -0,0 +1,25 @@
@@ -229,13 +257,13 @@
+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
+obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o
+obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
+obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
+obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
+obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o
+obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
++obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o
diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
new file mode 100644
index 0000000..a05b0d6
@@ -1409,10 +1437,10 @@
+#endif
diff --git a/drivers/input/lirc/lirc_atiusb.c b/drivers/input/lirc/lirc_atiusb.c
new file mode 100644
-index 0000000..b533000
+index 0000000..0e07204
--- /dev/null
+++ b/drivers/input/lirc/lirc_atiusb.c
-@@ -0,0 +1,1313 @@
+@@ -0,0 +1,1321 @@
+/* lirc_atiusb - USB remote support for LIRC
+ * (currently only supports X10 USB remotes)
+ * (supports ATI Remote Wonder and ATI Remote Wonder II, too)
@@ -1471,7 +1499,7 @@
+#include "lirc.h"
+#include "lirc_dev.h"
+
-+#define DRIVER_VERSION "$Revision$"
++#define DRIVER_VERSION "1.71"
+#define DRIVER_AUTHOR "Paul Miller <pmiller9 at users.sourceforge.net>"
+#define DRIVER_DESC "USB remote driver for LIRC"
+#define DRIVER_NAME "lirc_atiusb"
@@ -2649,10 +2677,11 @@
+ printk(KERN_INFO "\n" DRIVER_NAME ": " DRIVER_DESC " "
+ DRIVER_VERSION "\n");
+ printk(DRIVER_NAME ": " DRIVER_AUTHOR "\n");
-+ dprintk(DRIVER_NAME ": debug mode enabled: "
-+ "$Id$\n");
++ dprintk(DRIVER_NAME ": debug mode enabled\n");
+
++#ifdef MODULE
+ request_module("lirc_dev");
++#endif
+
+ repeat_jiffies = repeat*HZ/100;
+
@@ -2670,6 +2699,7 @@
+ usb_deregister(&usb_remote_driver);
+}
+
++#ifdef MODULE
+module_init(usb_remote_init);
+module_exit(usb_remote_exit);
+
@@ -2726,6 +2756,12 @@
+module_param(mgradient, int, 0644);
+MODULE_PARM_DESC(mgradient, "rw2 mouse: 1000*gradient from E to NE (default: "
+ "500 => .5 => ~27 degrees)");
++
++#else /* not MODULE */
++subsys_initcall(usb_remote_init);
++
++#endif /* MODULE */
++
diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c
new file mode 100644
index 0000000..01cbdfe
@@ -3122,10 +3158,10 @@
+ */
diff --git a/drivers/input/lirc/lirc_cmdir.c b/drivers/input/lirc/lirc_cmdir.c
new file mode 100644
-index 0000000..3ef3978
+index 0000000..1faa8e3
--- /dev/null
+++ b/drivers/input/lirc/lirc_cmdir.c
-@@ -0,0 +1,600 @@
+@@ -0,0 +1,596 @@
+/*
+ * lirc_cmdir.c - Driver for InnovationOne's COMMANDIR USB Transceiver
+ *
@@ -3150,10 +3186,6 @@
+ */
+
+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
+#include <linux/version.h>
+
+#include <linux/autoconf.h>
@@ -3759,10 +3791,10 @@
+#endif
diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
new file mode 100644
-index 0000000..5ccb08e
+index 0000000..c8f325c
--- /dev/null
+++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,812 @@
+@@ -0,0 +1,809 @@
+/*
+ * LIRC base driver
+ *
@@ -3784,10 +3816,6 @@
+ *
+ */
+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
+#include <linux/version.h>
+
+#include <linux/autoconf.h>
@@ -4535,8 +4563,6 @@
+
+/* ---------------------------------------------------------------------- */
+
-+/* For now dont try to use it as a static version ! */
-+
+#ifdef MODULE
+
+/*
@@ -4566,6 +4592,9 @@
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
++#else /* not a MODULE */
++subsys_initcall(lirc_dev_init);
++
+#endif /* MODULE */
+
+/*
@@ -4845,10 +4874,10 @@
+#endif
diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
new file mode 100644
-index 0000000..5fd569e
+index 0000000..4714641
--- /dev/null
+++ b/drivers/input/lirc/lirc_i2c.c
-@@ -0,0 +1,643 @@
+@@ -0,0 +1,639 @@
+/*
+ * i2c IR lirc plugin for Hauppauge and Pixelview cards - new 2.3.x i2c stack
+ *
@@ -4886,10 +4915,6 @@
+ */
+
+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kmod.h>
@@ -5494,10 +5519,10 @@
+ */
diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c
new file mode 100644
-index 0000000..6b3ac64
+index 0000000..ab9bdd6
--- /dev/null
+++ b/drivers/input/lirc/lirc_igorplugusb.c
-@@ -0,0 +1,611 @@
+@@ -0,0 +1,619 @@
+/* lirc_igorplugusb - USB remote support for LIRC
+ *
+ * Supports the standard homebrew IgorPlugUSB receiver with Igor's firmware.
@@ -6072,7 +6097,9 @@
+ printk(DRIVER_NAME ": " DRIVER_AUTHOR "\n");
+ dprintk(DRIVER_NAME ": debug mode enabled\n");
+
++#ifdef MODULE
+ request_module("lirc_dev");
++#endif
+
+ i = usb_register(&usb_remote_driver);
+ if (i < 0) {
@@ -6088,6 +6115,7 @@
+ usb_deregister(&usb_remote_driver);
+}
+
++#ifdef MODULE
+module_init(usb_remote_init);
+module_exit(usb_remote_exit);
+
@@ -6102,6 +6130,11 @@
+module_param(sample_rate, int, 0644);
+MODULE_PARM_DESC(sample_rate, "Sampling rate in Hz (default: 100)");
+
++#else /* not MODULE */
++subsys_initcall(usb_remote_driver);
++
++#endif /* MODULE */
++
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
@@ -6111,7 +6144,7 @@
+ */
diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
new file mode 100644
-index 0000000..0c307ca
+index 0000000..bdfd953
--- /dev/null
+++ b/drivers/input/lirc/lirc_imon.c
@@ -0,0 +1,1280 @@
@@ -6159,10 +6192,6 @@
+ *
+ */
+#include <linux/version.h>
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
+#include <linux/autoconf.h>
+
+#include <linux/errno.h>
@@ -7391,16 +7420,20 @@
+ info("module removed. Goodbye!");
+}
+
-+
++#ifdef MODULE
+module_init(imon_init);
+module_exit(imon_exit);
+
++#else
++subsys_initcall(imon_init);
++
++#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_it87.c b/drivers/input/lirc/lirc_it87.c
new file mode 100644
-index 0000000..1e8a6d3
+index 0000000..0a64847
--- /dev/null
+++ b/drivers/input/lirc/lirc_it87.c
-@@ -0,0 +1,1004 @@
+@@ -0,0 +1,999 @@
+/*
+ * LIRC driver for ITE IT8712/IT8705 CIR port
+ *
@@ -7436,11 +7469,6 @@
+
+#include <linux/version.h>
+#include <linux/module.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
+#include <linux/autoconf.h>
+
+
@@ -8529,10 +8557,10 @@
+/********************************* ITE IT87xx ************************/
diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
new file mode 100644
-index 0000000..2e1c178
+index 0000000..d03ecf7
--- /dev/null
+++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,548 @@
+@@ -0,0 +1,545 @@
+/*
+ * LIRC driver for ITE8709 CIR port
+ *
@@ -8557,12 +8585,9 @@
+#include <linux/version.h>
+#include <linux/module.h>
+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
+#include <linux/autoconf.h>
+#include <linux/interrupt.h>
++#include <linux/delay.h>
+
+#include <linux/pnp.h>
+#include <linux/io.h>
@@ -9083,10 +9108,10 @@
+ */
diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
new file mode 100644
-index 0000000..a4d335d
+index 0000000..f1874f3
--- /dev/null
+++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,884 @@
+@@ -0,0 +1,890 @@
+/*
+ * USB Microsoft IR Transceiver driver - 0.2
+ *
@@ -9961,6 +9986,7 @@
+ usb_deregister(&mceusb_driver);
+}
+
++#ifdef MODULE
+module_init(usb_mceusb_init);
+module_exit(usb_mceusb_exit);
+
@@ -9971,12 +9997,17 @@
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
++
++#else /* not MODULE */
++subsys_initcall(usb_mceusb_init);
++
++#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
new file mode 100644
-index 0000000..659d363
+index 0000000..1e683d3
--- /dev/null
+++ b/drivers/input/lirc/lirc_mceusb2.c
-@@ -0,0 +1,1117 @@
+@@ -0,0 +1,1119 @@
+/*
+ * LIRC driver for Philips eHome USB Infrared Transceiver
+ * and the Microsoft MCE 2005 Remote Control
@@ -10033,7 +10064,7 @@
+#include "lirc.h"
+#include "lirc_dev.h"
+
-+#define DRIVER_VERSION "$Revision$"
++#define DRIVER_VERSION "1.48"
+#define DRIVER_AUTHOR "Daniel Melander <lirc at rajidae.se>, " \
+ "Martin Blatter <martin_a_blatter at yahoo.com>"
+#define DRIVER_DESC "Philips eHome USB IR Transceiver and Microsoft " \
@@ -11059,6 +11090,7 @@
+ .id_table = usb_remote_table
+};
+
++#ifdef MODULE
+static int __init usb_remote_init(void)
+{
+ int i;
@@ -11094,12 +11126,13 @@
+
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
++#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c
new file mode 100644
-index 0000000..78c165b
+index 0000000..912cad2
--- /dev/null
+++ b/drivers/input/lirc/lirc_parallel.c
-@@ -0,0 +1,732 @@
+@@ -0,0 +1,728 @@
+/****************************************************************************
+ ** lirc_parallel.c *********************************************************
+ ****************************************************************************
@@ -11129,10 +11162,6 @@
+ ************************* Includes ***********************
+ ***********************************************************************/
+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
+#include <linux/version.h>
+
+#include <linux/autoconf.h>
@@ -11866,10 +11895,10 @@
+#endif
diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
new file mode 100644
-index 0000000..005a5e1
+index 0000000..003f492
--- /dev/null
+++ b/drivers/input/lirc/lirc_sasem.c
-@@ -0,0 +1,967 @@
+@@ -0,0 +1,969 @@
+/* lirc_sasem.c - USB remote support for LIRC
+ * Version 0.5
+ *
@@ -12812,6 +12841,7 @@
+ up(&disconnect_sem);
+}
+
++#ifdef MODULE
+static int __init sasem_init(void)
+{
+ int rc;
@@ -12837,12 +12867,13 @@
+module_init(sasem_init);
+module_exit(sasem_exit);
+
++#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
new file mode 100644
-index 0000000..f6533d5
+index 0000000..465edd9
--- /dev/null
+++ b/drivers/input/lirc/lirc_serial.c
-@@ -0,0 +1,1316 @@
+@@ -0,0 +1,1312 @@
+/****************************************************************************
+ ** lirc_serial.c ***********************************************************
+ ****************************************************************************
@@ -12893,10 +12924,6 @@
+ Steve Davies <steve at daviesfam.org> July 2001
+*/
+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
+#include <linux/version.h>
+
+#include <linux/autoconf.h>
@@ -14161,10 +14188,10 @@
+#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
new file mode 100644
-index 0000000..3e79c74
+index 0000000..ea192b2
--- /dev/null
+++ b/drivers/input/lirc/lirc_sir.c
-@@ -0,0 +1,1306 @@
+@@ -0,0 +1,1302 @@
+/*
+ * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
+ *
@@ -14204,10 +14231,6 @@
+#include <linux/version.h>
+#include <linux/module.h>
+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
+#include <linux/autoconf.h>
+
+#include <linux/module.h>
@@ -15473,7 +15496,7 @@
+#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
new file mode 100644
-index 0000000..d3e815f
+index 0000000..69865cb
--- /dev/null
+++ b/drivers/input/lirc/lirc_streamzap.c
@@ -0,0 +1,795 @@
@@ -15524,7 +15547,7 @@
+#include "lirc.h"
+#include "lirc_dev.h"
+
-+#define DRIVER_VERSION "$Revision$"
++#define DRIVER_VERSION "1.28"
+#define DRIVER_NAME "lirc_streamzap"
+#define DRIVER_DESC "Streamzap Remote Control driver"
+
@@ -16274,10 +16297,10 @@
+#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
new file mode 100644
-index 0000000..6e5b3d2
+index 0000000..9ed9c7b
--- /dev/null
+++ b/drivers/input/lirc/lirc_ttusbir.c
-@@ -0,0 +1,394 @@
+@@ -0,0 +1,400 @@
+/****************************************************************************
+ ** lirc_ttusbir.c ***********************************************************
+ ****************************************************************************
@@ -16670,16 +16693,22 @@
+ usb_deregister(&driver);
+}
+
++#ifdef MODULE
+module_init(ttusbir_init_module);
+module_exit(ttusbir_exit_module);
++
++#else
++subsys_initcall(ttusbir_init_module);
++
++#endif /* MODULE */
diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
new file mode 100644
-index 0000000..e7816fc
+index 0000000..20e6b27
--- /dev/null
+++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1397 @@
+@@ -0,0 +1,1395 @@
+/*
-+ * i2c IR lirc plugin for Hauppauge PVR 150 card
++ * i2c IR lirc plugin for devices with zilog IR processors
+ *
+ * Copyright (c) 2000 Gerd Knorr <kraxel at goldbach.in-berlin.de>
+ * modified for PixelView (BT878P+W/FM) by
@@ -16695,6 +16724,8 @@
+ * Thomas Reitmayr (treitmayr at yahoo.com)
+ * modified for Hauppauge PVR-150 IR TX device by
+ * Mark Weaver <mark at npsl.co.uk>
++ * changed name from lirc_pvr150 to lirc_zilog, works on more than pvr-150
++ * Jarod Wilson <jarod at redhat.com>
+ *
+ * parts are cut&pasted from the lirc_i2c.c driver
+ *
@@ -16715,10 +16746,6 @@
+ */
+
+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kmod.h>
@@ -16777,7 +16804,7 @@
+/* Minor -> data mapping */
+static struct IR *ir_devices[MAX_IRCTL_DEVICES];
+
-+/* Block size for haup PVR-150 IR transmitter */
++/* Block size for IR transmitter */
+#define TX_BLOCK_SIZE 99
+
+/* Hauppuage IR transmitter data */
@@ -17126,7 +17153,7 @@
+ return -EFAULT;
+}
+
-+/* send a block of data to the IR TX device of the PVR-150 */
++/* send a block of data to the IR TX device */
+static int send_data_block(struct IR *ir, unsigned char *data_block)
+{
+ int i, j, ret;
@@ -17151,7 +17178,7 @@
+ return 0;
+}
+
-+/* send boot data to the IR TX device of the PVR-150 */
++/* send boot data to the IR TX device */
+static int send_boot_data(struct IR *ir)
+{
+ int ret;
@@ -17204,12 +17231,11 @@
+
+ vfree(tx_data);
+ tx_data = NULL;
-+ dprintk("successfully unloaded PVR-150 IR "
-+ "blaster firmware\n");
++ dprintk("successfully unloaded IR blaster firmware\n");
+ }
+}
+
-+/* unload "firmware" for the IR TX device of the PVR-150 */
++/* unload "firmware" for the IR TX device */
+static void fw_unload(void)
+{
+ mutex_lock(&tx_data_lock);
@@ -17217,7 +17243,7 @@
+ mutex_unlock(&tx_data_lock);
+}
+
-+/* load "firmware" for the IR TX device of the PVR-150 */
++/* load "firmware" for the IR TX device */
+static int fw_load(struct IR *ir)
+{
+ int ret;
@@ -17357,7 +17383,7 @@
+ return ret;
+}
+
-+/* initialise the IR TX device of the PVR-150 */
++/* initialise the IR TX device */
+static int tx_init(struct IR *ir)
+{
+ int ret;
@@ -17450,7 +17476,7 @@
+ return ret ? ret : written;
+}
+
-+/* send a keypress to the IR TX device of the PVR-150 */
++/* send a keypress to the IR TX device */
+static int send_code(struct IR *ir, unsigned int code, unsigned int key)
+{
+ unsigned char data_block[TX_BLOCK_SIZE];
@@ -17707,7 +17733,7 @@
+ return 0;
+}
+
-+/* Open the IR device of the PVR-150. Get hold of our IR structure and
++/* Open the IR device. Get hold of our IR structure and
+ stash it in private_data for the file */
+static int open(struct inode *node, struct file *filep)
+{
@@ -17740,7 +17766,7 @@
+ return 0;
+}
+
-+/* Close the IR device of the PVR-150 */
++/* Close the IR device */
+static int close(struct inode *node, struct file *filep)
+{
+ /* find our IR struct */
@@ -17989,9 +18015,10 @@
+ adap->id == I2C_HW_B_CX2341X) {
+ int have_rx = 0, have_tx = 0;
+
-+ /* The external IR receiver is at
-+ * i2c address 0x71 on the PVR-150.
-+ * The IR transmitter is at 0x70. */
++ /*
++ * The external IR receiver is at i2c address 0x71.
++ * The IR transmitter is at 0x70.
++ */
+ memset(&c, 0, sizeof(c));
+ c.adapter = adap;
+ c.addr = 0x70;
- Previous message (by thread): rpms/perl-Tie-ToObject/devel import.log, NONE, 1.1 perl-Tie-ToObject.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-Tie-ToObject/devel perl-Tie-ToObject.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list