Author: pebender
Date: Tue Jan 13 23:02:49 2009
New Revision: 4246
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-usb_sysfs.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_persistent
trunk/gar-minimyth/script/system/lirc/Makefile
trunk/gar-minimyth/script/system/lirc/checksums
Log:
- Fixed a bug in LIRC that caused it to create the wrong sysfs device
link, which prevented access to bInterfaceNumber.
- Removed device instance from persistent links as it should no longer
be needed and was problematic (it changed).
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Jan 13
23:02:49 2009
@@ -56,8 +56,6 @@
- Renamed 06-minimyth-mythtv.rules to 07-minimyth-mythtv.rules.
- Added 05-minimyth-detect-tuner.rules for detecting tuner cards.
- Added 06-minimyth-firmware.rules for loading firmware.
- - Added an instance number to persistent device names to remove any
- chance of duplicate names.
- Renamed mm_uid to mm_persistent.
Fixed bugs
@@ -76,10 +74,10 @@
<http://lists.freedesktop.org/archives/xorg/2008-October/039591.html>.
- Fixed a bug that would cause MM_X_MODELINE_0, MM_X_MODELINE_1 and
MM_X_MODELINE_2 to fail with perl init scripts.
- - Added an instance number to persistent device names to remove any
- chance of duplicate names.
- Fixed bug that identified MM_PLUGIN_DVD_ENABLED as obsolete even
though
it is not.
+ - Fixed a bug in LIRC that caused it to create the wrong sysfs device
+ link, which prevented access to bInterfaceNumber.
Fixed build system
- Fixed lib/libftdi so that it does detect the system's boost library
and
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_persistent
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_persistent
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_persistent
Tue Jan 13 23:02:49 2009
@@ -5,10 +5,10 @@
# This script provides a persistent device name based on hardware
information.
#
# The output has the formats:
-#
persistent/<kernel>-pci:<class>:<class_prog>:<vendor>:<device>:<subsystem_vendor>:<subsystem_device>:<bus_id>:<instance>
-# persistent/<kernel>-phys:<phys>:<instance>
-#
persistent/<kernel>-usb:<idVendor>:<idProduct>:<serial>:<bInterfaceNumber>:<instance>
-# persistent/<kernel>-wminput:<phys>:<instance>
+#
persistent/<kernel>-pci:<class>:<class_prog>:<vendor>:<device>:<subsystem_vendor>:<subsystem_device>:<bus_id>
+# persistent/<kernel>-phys:<phys>
+#
persistent/<kernel>-usb:<idVendor>:<idProduct>:<serial>:<bInterfaceNumber>
+# persistent/<kernel>-wminput:<phys>
################################################################################
script='BEGIN
@@ -196,18 +196,6 @@
mm_persistent=`/sbin/udevadm info --attribute-walk --path ${DEVPATH} |
/usr/bin/awk "${script}"`
if /usr/bin/test -n "${mm_persistent}" ; then
mm_persistent="persistent/${mm_persistent}"
- # Add an instance number. Ideally, the instance number will always be
0.
- # However, some device vendors fail to fill in all the fields (e.g.
serial
- # number, and interface number) resulting in non-unique names. Adding
an
- # instance number ensures that the name will be unique.
- instance=0
- while /bin/true ; do
- if /usr/bin/test ! -e "/dev/${mm_persistent}:${instance}" ; then
- break
- fi
- instance=$((${instance} + 1))
- done
- mm_persistent="${mm_persistent}:${instance}"
fi
/bin/echo "${mm_persistent}"
Modified: trunk/gar-minimyth/script/system/lirc/Makefile
==============================================================================
--- trunk/gar-minimyth/script/system/lirc/Makefile (original)
+++ trunk/gar-minimyth/script/system/lirc/Makefile Tue Jan 13 23:02:49 2009
@@ -5,7 +5,7 @@
#MASTER_SITES = http://www.lirc.org/software/snapshots/
#MASTER_SITES =
cvs://anonym...@$(GARNAME).cvs.sourceforge.net:/cvsroot/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-lirc_i2c_device.patch $(DISTNAME)-no_python.patch
$(DISTNAME)-imon_module_param.patch $(DISTNAME)-imon_lcd_dynamic.patch
$(DISTNAME)-remove_smp_unsafe_drivers.patch $(DISTNAME)-remove_gpio.patch
+PATCHFILES = $(DISTNAME)-usb_sysfs.patch $(DISTNAME)-lirc_i2c_device.patch
$(DISTNAME)-no_python.patch $(DISTNAME)-imon_module_param.patch
$(DISTNAME)-imon_lcd_dynamic.patch
$(DISTNAME)-remove_smp_unsafe_drivers.patch $(DISTNAME)-remove_gpio.patch
LICENSE = GPL2
DESCRIPTION =
Modified: trunk/gar-minimyth/script/system/lirc/checksums
==============================================================================
--- trunk/gar-minimyth/script/system/lirc/checksums (original)
+++ trunk/gar-minimyth/script/system/lirc/checksums Tue Jan 13 23:02:49 2009
@@ -1,4 +1,5 @@
606b714ed843d28060163ffc571fc1f7 download/lirc-0.8.4a.tar.bz2
+b0109eb8f4b892d81617bd459a60b7bc download/lirc-0.8.4a-usb_sysfs.patch
e219e2e9dc7669eda6a43a3a53927272
download/lirc-0.8.4a-lirc_i2c_device.patch
1b7913de87a6ee1b71faf9fc7d32fb1d download/lirc-0.8.4a-no_python.patch
24b2a057f96e754ef84ea07e2be3b3fb
download/lirc-0.8.4a-imon_module_param.patch
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-usb_sysfs.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-usb_sysfs.patch
Tue Jan 13 23:02:49 2009
@@ -0,0 +1,115 @@
+diff -Naur lirc-0.8.4a-old/drivers/lirc_atiusb/lirc_atiusb.c
lirc-0.8.4a-new/drivers/lirc_atiusb/lirc_atiusb.c
+--- lirc-0.8.4a-old/drivers/lirc_atiusb/lirc_atiusb.c 2008-05-19
01:10:35.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_atiusb/lirc_atiusb.c 2009-01-13
22:41:17.000000000 -0800
+@@ -1046,8 +1046,9 @@
+ IRUNLOCK;
+ }
+
+-static struct irctl *new_irctl(struct usb_device *dev)
++static struct irctl *new_irctl(struct usb_interface *intf)
+ {
++ struct usb_device *dev = interface_to_usbdev(intf);
+ struct irctl *ir;
+ struct lirc_plugin *plugin;
+ int type, devnum;
+@@ -1120,7 +1121,7 @@
+ plugin->set_use_inc = &set_use_inc;
+ plugin->set_use_dec = &set_use_dec;
+ #ifdef LIRC_HAVE_SYSFS
+- plugin->dev = &dev->dev;
++ plugin->dev = &intf->dev;
+ #endif
+ plugin->owner = THIS_MODULE;
+ ir->usbdev = dev;
+@@ -1234,7 +1235,7 @@
+ ir = get_prior_reg_ir(dev);
+
+ if (!ir) {
+- ir = new_irctl(dev);
++ ir = new_irctl(intf);
+ if (!ir)
+ #ifdef KERNEL_2_5
+ return -ENOMEM;
+diff -Naur lirc-0.8.4a-old/drivers/lirc_igorplugusb/lirc_igorplugusb.c
lirc-0.8.4a-new/drivers/lirc_igorplugusb/lirc_igorplugusb.c
+--- lirc-0.8.4a-old/drivers/lirc_igorplugusb/lirc_igorplugusb.c
2008-01-26
05:50:56.000000000 -0800
++++ lirc-0.8.4a-new/drivers/lirc_igorplugusb/lirc_igorplugusb.c
2009-01-13
22:30:50.000000000 -0800
+@@ -524,7 +524,7 @@
+ plugin->sample_rate = sample_rate; /* per second */
+ plugin->add_to_buf = &usb_remote_poll;
+ #ifdef LIRC_HAVE_SYSFS
+- plugin->dev = &dev->dev;
++ plugin->dev = &intf->dev;
+ #endif
+ plugin->owner = THIS_MODULE;
+
+diff -Naur lirc-0.8.4a-old/drivers/lirc_imon/lirc_imon.c
lirc-0.8.4a-new/drivers/lirc_imon/lirc_imon.c
+--- lirc-0.8.4a-old/drivers/lirc_imon/lirc_imon.c 2008-08-22
14:38:17.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_imon/lirc_imon.c 2009-01-13
22:43:57.000000000 -0800
+@@ -1268,7 +1268,7 @@
+ plugin->set_use_inc = ir_open;
+ plugin->set_use_dec = ir_close;
+ #ifdef LIRC_HAVE_SYSFS
+- plugin->dev = &dev->dev;
++ plugin->dev = &interface->dev;
+ #endif
+ plugin->owner = THIS_MODULE;
+
+diff -Naur lirc-0.8.4a-old/drivers/lirc_mceusb/lirc_mceusb.c
lirc-0.8.4a-new/drivers/lirc_mceusb/lirc_mceusb.c
+--- lirc-0.8.4a-old/drivers/lirc_mceusb/lirc_mceusb.c 2008-05-16
15:02:13.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_mceusb/lirc_mceusb.c 2009-01-13
22:33:22.000000000 -0800
+@@ -847,7 +847,7 @@
+ plugin->add_to_buf = &mceusb_add_to_buf;
+ /* plugin->fops = &mceusb_fops; */
+ #ifdef LIRC_HAVE_SYSFS
+- plugin->dev = &udev->dev;
++ plugin->dev = &interface->dev;
+ #endif
+ plugin->owner = THIS_MODULE;
+ if (lirc_register_plugin(plugin) < 0) {
+diff -Naur lirc-0.8.4a-old/drivers/lirc_mceusb2/lirc_mceusb2.c
lirc-0.8.4a-new/drivers/lirc_mceusb2/lirc_mceusb2.c
+--- lirc-0.8.4a-old/drivers/lirc_mceusb2/lirc_mceusb2.c 2008-09-30
08:21:10.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_mceusb2/lirc_mceusb2.c 2009-01-13
22:31:44.000000000 -0800
+@@ -955,7 +955,7 @@
+ plugin->code_length = sizeof(lirc_t) * 8;
+ plugin->ioctl = lirc_ioctl;
+ plugin->fops = &lirc_fops;
+- plugin->dev = &dev->dev;
++ plugin->dev = &intf->dev;
+ plugin->owner = THIS_MODULE;
+
+ init_MUTEX(&ir->lock);
+diff -Naur lirc-0.8.4a-old/drivers/lirc_sasem/lirc_sasem.c
lirc-0.8.4a-new/drivers/lirc_sasem/lirc_sasem.c
+--- lirc-0.8.4a-old/drivers/lirc_sasem/lirc_sasem.c 2008-05-16
15:02:13.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_sasem/lirc_sasem.c 2009-01-13
22:34:02.000000000 -0800
+@@ -950,7 +950,7 @@
+ plugin->set_use_inc = ir_open;
+ plugin->set_use_dec = ir_close;
+ #ifdef LIRC_HAVE_SYSFS
+- plugin->dev = &dev->dev;
++ plugin->dev = &interface->dev;
+ #endif
+ plugin->owner = THIS_MODULE;
+
+diff -Naur lirc-0.8.4a-old/drivers/lirc_streamzap/lirc_streamzap.c
lirc-0.8.4a-new/drivers/lirc_streamzap/lirc_streamzap.c
+--- lirc-0.8.4a-old/drivers/lirc_streamzap/lirc_streamzap.c 2008-09-17
11:20:16.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_streamzap/lirc_streamzap.c 2009-01-13
22:34:38.000000000 -0800
+@@ -600,7 +600,7 @@
+ sz->plugin.set_use_dec = &streamzap_use_dec;
+ sz->plugin.ioctl = streamzap_ioctl;
+ #ifdef LIRC_HAVE_SYSFS
+- sz->plugin.dev = &udev->dev;
++ sz->plugin.dev = &interface->dev;
+ #endif
+ sz->plugin.owner = THIS_MODULE;
+
+diff -Naur lirc-0.8.4a-old/drivers/lirc_ttusbir/lirc_ttusbir.c
lirc-0.8.4a-new/drivers/lirc_ttusbir/lirc_ttusbir.c
+--- lirc-0.8.4a-old/drivers/lirc_ttusbir/lirc_ttusbir.c 2008-05-16
15:02:13.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_ttusbir/lirc_ttusbir.c 2009-01-13
22:39:27.000000000 -0800
+@@ -314,6 +314,7 @@
+ ttusbir->plugin.set_use_dec = set_use_dec;
+ ttusbir->plugin.ioctl = NULL;
+ ttusbir->plugin.fops = NULL;
++ ttusbir->plugin.dev = &intf->dev;
+ ttusbir->plugin.owner = THIS_MODULE;
+ ttusbir->plugin.features = LIRC_CAN_REC_MODE2;
+ ttusbir->minor = lirc_register_plugin(&ttusbir->plugin);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
