X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=48979393a5c2776a4340c5cb7703c95013996574;hb=221204964609fec81f50a6c411f276c88f412755;hp=10df31458d5cbebcffa93bf256d31777f905f18b;hpb=1331c889c33a91f098fa7257488046e81241225c;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index 10df31458..48979393a 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -31,11 +31,10 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
 
-static char sysfs_path[SYSFS_PATH_MAX];
-
 /* 
  * Right now the major/minor of a device is stored in a file called
  * "dev" in sysfs.
@@ -94,6 +93,7 @@ static int create_node(char *name, char type, int major, int minor, int mode)
 		return -EINVAL;
 	}
 
+	dbg("mknod(%s, %#o, %u, %u)", filename, mode, major, minor);
 	retval = mknod(filename,mode,makedev(major,minor));
 	if (retval)
 		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
@@ -103,8 +103,18 @@ static int create_node(char *name, char type, int major, int minor, int mode)
 
 struct sysfs_class_device *get_class_dev(char *device_name)
 {
+	char sysfs_path[SYSFS_PATH_MAX];
 	char dev_path[SYSFS_PATH_MAX];
-	struct sysfs_class_device *class_dev;
+	int retval;
+	struct sysfs_class_device *class_dev = NULL;
+
+
+	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+	dbg("sysfs_path = %s", sysfs_path);
+	if (retval) {
+		dbg("sysfs_get_mnt_path failed");
+		goto exit;
+	}
 
 	strcpy(dev_path, sysfs_path);
 	strcat(dev_path, device_name);
@@ -115,46 +125,35 @@ struct sysfs_class_device *get_class_dev(char *device_name)
 	class_dev = sysfs_open_class_device(dev_path);
 	if (class_dev == NULL) {
 		dbg ("sysfs_open_class_device failed");
-		return NULL;
+		goto exit;
 	}
 	dbg("class_dev->name = %s", class_dev->name);
 
+exit:
 	return class_dev;
 }
 
-static int udev_init(void)
-{
-	int retval;
-
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	dbg("sysfs_path = %s", sysfs_path);
-	return retval;
-}
-
 int udev_add_device(char *device, char *subsystem)
 {
 	struct sysfs_class_device *class_dev;
 	struct device_attr attr;
-	//char *name;
+	struct udevice dbdev;
 	int major;
 	int minor;
 	char type;
-	//int mode;
 	int retval = -EINVAL;
 
-	/* sleep for a second or two to give the kernel a chance to
-	 * create the dev file
-	 */
-	sleep(1);
-
-	udev_init();
-
 	/* for now, the block layer is the only place where block devices are */
 	if (strcmp(subsystem, "block") == 0)
 		type = 'b';
 	else
 		type = 'c';
 
+	/* sleep for a second or two to give the kernel a chance to
+	 * create the dev file
+	 */
+	sleep(1);
+
 	class_dev = get_class_dev(device);
 	if (class_dev == NULL)
 		goto exit;
@@ -168,9 +167,31 @@ int udev_add_device(char *device, char *subsystem)
 		dbg ("get_major_minor failed");
 		goto exit;
 	}
+	memset(&dbdev, 0, sizeof(dbdev));
+	strncpy(dbdev.name, attr.name, NAME_SIZE);
+	strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path,
+		PATH_SIZE);
+	strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE);
+	if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE))
+	    != 0)
+		strcpy(dbdev.class_name, "unkown");
+	strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE);
+	strcpy(dbdev.bus_name, "unknown");
+	if (class_dev->driver != NULL)
+		strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE);
+	else
+		strcpy(dbdev.driver, "unkown");
+	dbdev.type = type;
+	dbdev.major = major;
+	dbdev.minor = minor;
+	dbdev.mode = attr.mode;
 
 	sysfs_close_class_device(class_dev);
 
+	retval = udevdb_add_udevice(&dbdev);
+	if (retval != 0)
+		goto exit;
+
 	return create_node(attr.name, type, major, minor, attr.mode);
 
 exit: