X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=wait_for_sysfs.c;h=6f396b96caf10ce6c7bf1a67035e2b90af579957;hb=f93987240e34ceb5cc4f9cdde59a54b1a0011ee1;hp=16ee50e4a765809aa8b983ac1c5c5038991ca641;hpb=606397db856af2b66947daed4a4a927c37951fe8;p=elogind.git

diff --git a/wait_for_sysfs.c b/wait_for_sysfs.c
index 16ee50e4a..6f396b96c 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 */
@@ -63,6 +64,10 @@ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev
 		{ .subsystem = "usb_host",	.file = NULL },
 		{ .subsystem = "bluetooth",	.file = "address" },
 		{ .subsystem = "i2c-adapter",	.file = NULL },
+		{ .subsystem = "pci_bus",	.file = NULL },
+		{ .subsystem = "ieee1394",	.file = NULL },
+		{ .subsystem = "ieee1394_host",	.file = NULL },
+		{ .subsystem = "ieee1394_node",	.file = NULL },
 		{ NULL, NULL }
 	};
 	struct class_file *classfile;
@@ -96,52 +101,86 @@ 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)
 {
-	static char *devices_without_link[] = {
-		"nb",
-		"ram",
-		"loop",
-		"fd",
-		"md",
-		"dos_cd",
-		"double",
-		"flash",
-		"msd",
-		"rflash",
-		"rom",
-		"rrom",
-		"sbpcd",
-		"pcd",
-		"pf",
-		"scd",
-		"sit",
-		"lp",
-		"ubd",
-		"vcs",
-		"vcsa",
-		"console",
-		"tty",
-		"ttyS",
-		NULL
+	/* 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;
+	} class_device[] = {
+		{ .subsystem = "block",		.device = "double" },
+		{ .subsystem = "block",		.device = "nb" },
+		{ .subsystem = "block",		.device = "ram" },
+		{ .subsystem = "block",		.device = "loop" },
+		{ .subsystem = "block",		.device = "fd" },
+		{ .subsystem = "block",		.device = "md" },
+		{ .subsystem = "block",		.device = "dos_cd" },
+		{ .subsystem = "block",		.device = "rflash" },
+		{ .subsystem = "block",		.device = "rom" },
+		{ .subsystem = "block",		.device = "rrom" },
+		{ .subsystem = "block",		.device = "flash" },
+		{ .subsystem = "block",		.device = "msd" },
+		{ .subsystem = "block",		.device = "sbpcd" },
+		{ .subsystem = "block",		.device = "pcd" },
+		{ .subsystem = "block",		.device = "pf" },
+		{ .subsystem = "block",		.device = "scd" },
+		{ .subsystem = "block",		.device = "ubd" },
+		{ .subsystem = "input",		.device = "event" },
+		{ .subsystem = "input",		.device = "mice" },
+		{ .subsystem = "input",		.device = "mouse" },
+		{ .subsystem = "input",		.device = "ts" },
+		{ .subsystem = "vc",		.device = NULL },
+		{ .subsystem = "tty",		.device = NULL },
+		{ .subsystem = "cpuid",		.device = "cpu" },
+		{ .subsystem = "graphics",	.device = "fb" },
+		{ .subsystem = "mem",		.device = NULL },
+		{ .subsystem = "misc",		.device = NULL },
+		{ .subsystem = "msr",		.device = NULL },
+		{ .subsystem = "netlink",	.device = NULL },
+		{ .subsystem = "net",		.device = "sit" },
+		{ .subsystem = "net",		.device = "ppp" },
+		{ .subsystem = "net",		.device = "lo" },
+		{ .subsystem = "net",		.device = "tap" },
+		{ .subsystem = "net",		.device = "ipsec" },
+		{ .subsystem = "sound",		.device = NULL },
+		{ .subsystem = "printer",	.device = "lp" },
+		{ .subsystem = "nvidia",	.device = NULL },
+		{ .subsystem = "video4linux",	.device = "vbi" },
+		{ .subsystem = "lirc",		.device = NULL },
+		{ .subsystem = "firmware",	.device = NULL },
+		{ .subsystem = "drm",		.device = NULL },
+		{ .subsystem = "pci_bus",	.device = NULL },
+		{ .subsystem = "ieee1394",	.device = NULL },
+		{ .subsystem = "ieee1394_host",	.device = NULL },
+		{ .subsystem = "ieee1394_node",	.device = NULL },
+		{ .subsystem = "raw",		.device = NULL },
+		{ NULL, NULL }
 	};
-	char **device;
+	struct class_device *classdevice;
+	int len;
 
-	for (device = devices_without_link; *device != NULL; device++) {
-		int len = strlen(*device);
+	for (classdevice = class_device; classdevice->subsystem != NULL; classdevice++) {
+		if (strcmp(class_dev->classname, classdevice->subsystem) == 0) {
+			/* see if no device in this class is expected to have a device-link */
+			if (classdevice->device == NULL)
+				return 1;
 
-		/* look if name matches */
-		if (strncmp(class_dev->name, *device, len) != 0)
-			continue;
+			len = strlen(classdevice->device);
 
-		/* exact match */
-		if (strlen(class_dev->name) == len)
-			return 1;
+			/* see if device name matches */
+			if (strncmp(class_dev->name, classdevice->device, len) != 0)
+				continue;
 
-		/* instance numbers are matching too */
-		if (isdigit(class_dev->name[len]))
-			return 1;
+			/* exact name match */
+			if (strlen(class_dev->name) == len)
+				return 1;
+
+			/* name match with instance number */
+			if (isdigit(class_dev->name[len]))
+				return 1;
+		}
 	}
 
 	return 0;
@@ -373,9 +412,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;
 }