merge device event handling and make database content available on "remove"

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 5d54b5443248c894f142169de404bad78d8f4086..615253a52f08083f7f2d18e1b4a3fc3aa152ed1a 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -54,6 +54,7 @@ struct udev_rules;
 
 struct sysfs_device {
        struct list_head node;                  /* for device cache */
+       struct sysfs_device *parent;            /* already cached parent*/
        char devpath[PATH_SIZE];
        char subsystem[NAME_SIZE];              /* $class/$bus/"drivers" */
        char kernel_name[NAME_SIZE];            /* device instance name */
@@ -113,14 +114,13 @@ extern void sysfs_cleanup(void);
 extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, const char *subsystem);
 extern struct sysfs_device *sysfs_device_get(const char *devpath);
 extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
+extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
 extern char *sysfs_attr_get_value(const char *devpath, const char *attr_name);
 
-/* udev_add.c */
-extern int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
-extern int udev_add_device(struct udevice *udev);
-
-/* udev_remove.c */
-extern int udev_remove_device(struct udevice *udev);
+/* udev_node.c */
+extern int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
+extern int udev_node_add(struct udevice *udev);
+extern int udev_node_remove(struct udevice *udev);
 
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);