Changeset 997 for trunk

Timestamp:

08/22/07 08:20:40 (17 months ago)

Author:

aj

Message:

commit changes so this code works without CONFIG_USB_DEVICEFS.

Location:

trunk/etc

Files:

• openct.udev (modified) (1 diff)
• openct.udev.modalias (modified) (1 diff)
• openct_usb.in (modified) (1 diff)

trunk/etc/openct.udev

@@ -13 +13 @@
 SUBSYSTEM!="usb", GOTO="openct_usb_rules_end"
 ACTION!="add", GOTO="openct_usb_rules_end"
+
+# some distributions might not have a proper rule to set the name.
+# this is needed without USB_DEVICEFS the kernel doesn't tell us about
+# DEVICE. so we need to know the name of the device created by udev in
+# /dev/bus/usb.
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
+        NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
 # last file created by the kernel, if this is present everything should be

trunk/etc/openct.udev.modalias

@@ -13 +13 @@
 SUBSYSTEM!="usb", GOTO="openct_usb_rules_end"
 ACTION!="add", GOTO="openct_usb_rules_end"
+
+# some distributions might not have a proper rule to set the name.
+# this is needed without USB_DEVICEFS the kernel doesn't tell us about
+# DEVICE. so we need to know the name of the device created by udev in
+# /dev/bus/usb.
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
+        NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
 # egate

trunk/etc/openct_usb.in

@@ -2 +2 @@
 
 test "$ACTION" = "add" || exit 0
-test -n "$DEVICE" -o -n "$DEVNAME" || exit 0 
 test -e /var/run/openct/status || exit 0
 
 (
+
+# try to get the device path from udevinfo.
+if [ -z "$DEVICE" -a -u "$DEVNAME" ]
+then
+        if [ -z "$DEVPATH" ]
+        then
+                exit 0
+        fi
+        UDEVINFO="`udevinfo --query=name --path=$(dirname $DEVPATH)`"
+        if [ -z "$UDEVINFO" ]
+        then
+                exit 0
+        fi
+        DEVICE="/dev/$UDEVINFO"
+fi
 
 if [ -n "$DEVICE" ]