X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_sysfs.c;h=f0666509eaca5b87614d4124eb5a5e0d014ff4c5;hp=6655968433cfb47a63d6373b3650b5c8e7a95279;hb=7e720bd4ad8257d81d273d98294ebbcc03ade9ba;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132

diff --git a/udev_sysfs.c b/udev_sysfs.c
index 665596843..f0666509e 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -39,6 +39,7 @@ static const struct subsystem_file {
 	const char *subsystem;
 	const char *file;
 } subsystem_files[] = {
+	{ .subsystem = "class",		.file = NULL },
 	{ .subsystem = "net",		.file = "ifindex" },
 	{ .subsystem = "scsi_host",	.file = "unique_id" },
 	{ .subsystem = "scsi_device",	.file = NULL },
@@ -51,9 +52,30 @@ static const struct subsystem_file {
 	{ .subsystem = "ieee1394",	.file = NULL },
 	{ .subsystem = "ieee1394_host",	.file = NULL },
 	{ .subsystem = "ieee1394_node",	.file = NULL },
+	{ .subsystem = "fc_transport",	.file = "port_id" },
+	{ .subsystem = "fc_host",	.file = "port_id" },
+	{ .subsystem = "spi_transport",	.file = "width" },
+	{ .subsystem = "spi_host",	.file = "width" },
 	{ NULL, NULL }
 };
 
+dev_t get_devt(struct sysfs_class_device *class_dev)
+{
+	struct sysfs_attribute *attr = NULL;
+	unsigned int major, minor;
+
+	attr = sysfs_get_classdev_attr(class_dev, "dev");
+	if (attr == NULL)
+		return 0;
+	dbg("dev='%s'", attr->value);
+
+	if (sscanf(attr->value, "%u:%u", &major, &minor) != 2)
+		return 0;
+	dbg("found major=%d, minor=%d", major, minor);
+
+	return makedev(major, minor);
+}
+
 int subsystem_expect_no_dev(const char *subsystem)
 {
 	const struct subsystem_file *file;
@@ -170,9 +192,12 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "net",		.device = "bnep" },
 		{ .subsystem = "net",		.device = "vmnet" },
 		{ .subsystem = "net",		.device = "ippp" },
+		{ .subsystem = "net",		.device = "nlv" },
+		{ .subsystem = "net",		.device = "atml" },
 		{ .subsystem = "ppp",		.device = NULL },
 		{ .subsystem = "sound",		.device = NULL },
 		{ .subsystem = "printer",	.device = "lp" },
+		{ .subsystem = "ppdev",		.device = NULL },
 		{ .subsystem = "nvidia",	.device = NULL },
 		{ .subsystem = "video4linux",	.device = "vbi" },
 		{ .subsystem = "dvb",		.device = NULL },
@@ -203,7 +228,7 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ NULL, NULL }
 	};
 	const struct class_device *classdevice;
-	int len;
+	unsigned int len;
 
 	/* the kernel may tell us what to wait for */
 	if (kernel_release_satisfactory(2,6,10) > 0)
@@ -274,6 +299,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 		{ .bus = "ide",		.file = "detach_state" },
 		{ .bus = "pci",		.file = "vendor" },
 		{ .bus = "platform",	.file = "detach_state" },
+		{ .bus = "pcmcia",	.file = "detach_state" },
 		{ .bus = "i2c",		.file = "detach_state" },
 		{ .bus = "ieee1394",	.file = "node_count" },
 		{ .bus = "ieee1394",	.file = "nodeid" },
@@ -372,7 +398,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 
 struct sysfs_class_device *wait_class_device_open(const char *path)
 {
-	struct sysfs_class_device *class_dev;
+	struct sysfs_class_device *class_dev = NULL;
 	int loop;
 
 	loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
@@ -384,7 +410,7 @@ struct sysfs_class_device *wait_class_device_open(const char *path)
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
 
-	return (class_dev);
+	return class_dev;
 }
 
 int wait_for_class_device(struct sysfs_class_device *class_dev,
@@ -441,7 +467,7 @@ int wait_for_class_device(struct sysfs_class_device *class_dev,
 
 struct sysfs_device *wait_devices_device_open(const char *path)
 {
-	struct sysfs_device *devices_dev;
+	struct sysfs_device *devices_dev = NULL;
 	int loop;
 
 	loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
@@ -453,5 +479,5 @@ struct sysfs_device *wait_devices_device_open(const char *path)
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
 
-	return(devices_dev);
+	return devices_dev;
 }