X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_sysfs.c;h=fc7ee885b0b91fd08d208955f369991d489a33f4;hp=e2c706c6f5d6477abd60fc3899966281256e04f9;hb=75bc9b086fe0f212e52da8425e4a4cb2d8f38090;hpb=8474ff500fa5671185f6203f5f20162304a5c7df

diff --git a/udev_sysfs.c b/udev_sysfs.c
index e2c706c6f..fc7ee885b 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -31,14 +31,15 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_version.h"
 #include "udev_sysfs.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 
 /* list of subsystem specific files, NULL if there is no file to wait for */
-static struct subsystem_file {
-	char *subsystem;
-	char *file;
+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,12 +52,33 @@ static 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)
 {
-	struct subsystem_file *file;
+	const struct subsystem_file *file;
 
 	for (file = subsystem_files; file->subsystem != NULL; file++)
 		if (strcmp(subsystem, file->subsystem) == 0)
@@ -66,9 +88,9 @@ int subsystem_expect_no_dev(const char *subsystem)
 }
 
 /* get subsystem specific files, returns "dev" if no other found */
-static char *get_subsystem_specific_file(const char *subsystem)
+static const char *get_subsystem_specific_file(const char *subsystem)
 {
-	struct subsystem_file *file;
+	const struct subsystem_file *file;
 
 	/* look if we want to look for another file instead of "dev" */
 	for (file = subsystem_files; file->subsystem != NULL; file++)
@@ -123,9 +145,9 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 {
 	/* 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;
+	static const struct class_device {
+		const char *subsystem;
+		const char *device;
 	} class_device[] = {
 		{ .subsystem = "block",		.device = "double" },
 		{ .subsystem = "block",		.device = "nb" },
@@ -150,6 +172,7 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "input",		.device = "mice" },
 		{ .subsystem = "input",		.device = "mouse" },
 		{ .subsystem = "input",		.device = "ts" },
+		{ .subsystem = "input",		.device = "js" },
 		{ .subsystem = "vc",		.device = NULL },
 		{ .subsystem = "tty",		.device = NULL },
 		{ .subsystem = "cpuid",		.device = "cpu" },
@@ -170,9 +193,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 },
@@ -202,8 +228,8 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "capi",		.device = NULL },
 		{ NULL, NULL }
 	};
-	struct class_device *classdevice;
-	int len;
+	const struct class_device *classdevice;
+	unsigned int len;
 
 	/* the kernel may tell us what to wait for */
 	if (kernel_release_satisfactory(2,6,10) > 0)
@@ -240,13 +266,13 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 /* skip waiting for the bus of the devices device */
 static int class_device_expect_no_bus(struct sysfs_class_device *class_dev)
 {
-	static char *devices_without_bus[] = {
+	static const char *devices_without_bus[] = {
 		"scsi_host",
 		"i2c-adapter",
 		"i2c-dev",
 		NULL
 	};
-	char **device;
+	const char **device;
 
 	for (device = devices_without_bus; *device != NULL; device++) {
 		int len = strlen(*device);
@@ -262,9 +288,9 @@ static int class_device_expect_no_bus(struct sysfs_class_device *class_dev)
 int wait_for_devices_device(struct sysfs_device *devices_dev,
 			const char **error)
 {
-	static struct device_file {
-		char *bus;
-		char *file;
+	static const struct device_file {
+		const char *bus;
+		const char *file;
 	} device_files[] = {
 		{ .bus = "scsi",	.file = "vendor" },
 		{ .bus = "usb",		.file = "idVendor" },
@@ -274,13 +300,15 @@ 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" },
 		{ .bus = "ieee1394",	.file = "address" },
-		{ .bus = "bttv-sub",	.file = "detach_state" },
+		{ .bus = "bttv-sub",	.file = NULL },
 		{ .bus = "pnp",		.file = "detach_state" },
 		{ .bus = "eisa",	.file = "detach_state" },
+		{ .bus = "serio",	.file = "detach_state" },
 		{ .bus = "pseudo",	.file = "detach_state" },
 		{ .bus = "mmc",		.file = "detach_state" },
 		{ .bus = "macio",	.file = "detach_state" },
@@ -302,7 +330,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 		{ .bus = "iucv",	.file = "detach_state" },
 		{ NULL, NULL }
 	};
-	struct device_file *devicefile;
+	const struct device_file *devicefile = NULL;
 	int loop;
 
 	/* the kernel may tell us what to wait for */
@@ -338,6 +366,11 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 				char filename[SYSFS_PATH_MAX];
 				struct stat stats;
 
+				if (devicefile->file == NULL) {
+					dbg("bus '%s' has no file to wait for", devices_dev->bus);
+					return 0;
+				}
+
 				found_bus_type = 1;
 				snprintf(filename, SYSFS_PATH_MAX-1, "%s/%s", devices_dev->path, devicefile->file);
 				dbg("looking at bus '%s' device for specific file '%s'", devices_dev->bus, filename);
@@ -367,7 +400,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;
@@ -379,7 +412,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,
@@ -436,7 +469,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;
@@ -448,5 +481,5 @@ struct sysfs_device *wait_devices_device_open(const char *path)
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
 
-	return(devices_dev);
+	return devices_dev;
 }