X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=wait_for_sysfs.c;h=25a3fb4eef9bcf4279a5f07e5c4c4770ca2461ca;hp=bce60731fa6ab00b9b86deedc777fd2d9ea060a7;hb=396bb4c3d33dfd68c5817da5e03251fbd82e2713;hpb=8372907752159970c86c3f7cc565c35cf2fa1ef9

diff --git a/wait_for_sysfs.c b/wait_for_sysfs.c
index bce60731f..25a3fb4ee 100644
--- a/wait_for_sysfs.c
+++ b/wait_for_sysfs.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 
 #include "logging.h"
+#include "udev_version.h"
 #include "libsysfs/sysfs/libsysfs.h"
 
 #ifdef LOG
@@ -46,7 +47,7 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-#define WAIT_MAX_SECONDS		5
+#define WAIT_MAX_SECONDS		10
 #define WAIT_LOOP_PER_SECOND		20
 
 /* wait for specific file to show up, normally the "dev"-file */
@@ -59,9 +60,10 @@ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev
 		{ .subsystem = "net",		.file = "ifindex" },
 		{ .subsystem = "scsi_host",	.file = "unique_id" },
 		{ .subsystem = "scsi_device",	.file = NULL },
-		{ .subsystem = "pcmcia_socket",	.file = "card_type" },
+		{ .subsystem = "pcmcia_socket",	.file = NULL }, /* all files are unreadable in empty slot :( */
 		{ .subsystem = "usb_host",	.file = NULL },
 		{ .subsystem = "bluetooth",	.file = "address" },
+		{ .subsystem = "firmware",	.file = "data" },
 		{ .subsystem = "i2c-adapter",	.file = NULL },
 		{ .subsystem = "pci_bus",	.file = NULL },
 		{ .subsystem = "ieee1394",	.file = NULL },
@@ -100,11 +102,11 @@ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev
 	return -1;
 }
 
-/* skip waiting for physical device */
+/* check if we need to wait for a physical device */
 static int class_device_expect_no_device_link(struct sysfs_class_device *class_dev)
 {
-	/* List of devices without a "device" symlink
-	 * set .device to NULL to accept all devices in that subsystem */
+	/* list of devices without a "device" symlink to the physical device
+	 * if device is set to NULL, no devices in that subsystem has a link */
 	static struct class_device {
 		char *subsystem;
 		char *device;
@@ -138,11 +140,16 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "misc",		.device = NULL },
 		{ .subsystem = "msr",		.device = NULL },
 		{ .subsystem = "netlink",	.device = NULL },
-		{ .subsystem = "net",		.device = NULL },
+		{ .subsystem = "net",		.device = "sit" },
+		{ .subsystem = "net",		.device = "ppp" },
+		{ .subsystem = "net",		.device = "lo" },
+		{ .subsystem = "net",		.device = "tap" },
+		{ .subsystem = "net",		.device = "ipsec" },
+		{ .subsystem = "net",		.device = "irda" },
 		{ .subsystem = "sound",		.device = NULL },
 		{ .subsystem = "printer",	.device = "lp" },
 		{ .subsystem = "nvidia",	.device = NULL },
-		{ .subsystem = "video4linux",	.device = NULL },
+		{ .subsystem = "video4linux",	.device = "vbi" },
 		{ .subsystem = "lirc",		.device = NULL },
 		{ .subsystem = "firmware",	.device = NULL },
 		{ .subsystem = "drm",		.device = NULL },
@@ -150,15 +157,15 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "ieee1394",	.device = NULL },
 		{ .subsystem = "ieee1394_host",	.device = NULL },
 		{ .subsystem = "ieee1394_node",	.device = NULL },
+		{ .subsystem = "raw",		.device = NULL },
 		{ NULL, NULL }
 	};
 	struct class_device *classdevice;
 	int len;
 
-	/* look if we want to look for another file instead of "dev" */
 	for (classdevice = class_device; classdevice->subsystem != NULL; classdevice++) {
 		if (strcmp(class_dev->classname, classdevice->subsystem) == 0) {
-			/* if device is NULL, all devices in this class are ok */
+			/* see if no device in this class is expected to have a device-link */
 			if (classdevice->device == NULL)
 				return 1;
 
@@ -168,11 +175,11 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 			if (strncmp(class_dev->name, classdevice->device, len) != 0)
 				continue;
 
-			/* exact match */
+			/* exact name match */
 			if (strlen(class_dev->name) == len)
 				return 1;
 
-			/* instance numbers are matching too */
+			/* name match with instance number */
 			if (isdigit(class_dev->name[len]))
 				return 1;
 		}
@@ -407,9 +414,10 @@ exit:
 	if (rc == 0)
 		dbg("result: waiting for sysfs successful '%s'", devpath);
 	else
-		info("error: wait_for_sysfs needs an update to handle the device '%s' "
-		     "properly, please report to <linux-hotplug-devel@lists.sourceforge.net>",
-		     devpath);
+		info("either wait_for_sysfs (udev %s) needs an update to handle the device '%s' "
+		     "properly (%d) or the sysfs-support of your device's driver needs to be fixed, "
+		     "please report to <linux-hotplug-devel@lists.sourceforge.net>",
+		     UDEV_VERSION, devpath, rc);
 
 	return rc;
 }