update Debian rules

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 6dc0c9e3547b2f48bf4cbf0d23be84d28f7c4796..79942e71cd04608791d15a4a37b3e5fa14f6eb3c 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -30,41 +30,43 @@
 #include "udev_libc_wrapper.h"
 #include "udev_version.h"
 
-#define COMMENT_CHARACTER              '#'
-#define PATH_TO_NAME_CHAR              '@'
-#define LINE_SIZE                      512
-#define NAME_SIZE                      128
-#define PATH_SIZE                      256
-#define USER_SIZE                      32
-#define SEQNUM_SIZE                    32
-#define VALUE_SIZE                     128
-
-#define DEFAULT_PARTITIONS_COUNT       15
-#define UDEV_ALARM_TIMEOUT             180
+#define COMMENT_CHARACTER                      '#'
+#define PATH_TO_NAME_CHAR                      '@'
+#define LINE_SIZE                              512
+#define NAME_SIZE                              128
+#define PATH_SIZE                              256
+#define USER_SIZE                              32
+#define SEQNUM_SIZE                            32
+#define VALUE_SIZE                             128
+
+#define DEFAULT_PARTITIONS_COUNT               15
+#define UDEV_ALARM_TIMEOUT                     180
 
 #define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
 
 /* pipes */
-#define READ_END                       0
-#define WRITE_END                      1
+#define READ_END                               0
+#define WRITE_END                              1
 
-#define DB_DIR                         ".udev/db"
+#define DB_DIR                                 ".udev/db"
 
 struct udev_rules;
 
 struct sysfs_device {
-       struct list_head node;          /* for device cache */
+       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 */
+       char subsystem[NAME_SIZE];              /* $class/$bus/"drivers" */
+       char kernel_name[NAME_SIZE];            /* device instance name */
        char kernel_number[NAME_SIZE];
-       char driver[NAME_SIZE];         /* device driver name */
+       char driver[NAME_SIZE];                 /* device driver name */
 };
 
 struct udevice {
        /* device event */
-       struct sysfs_device *dev;       /* points to dev_local by default */
+       struct sysfs_device *dev;               /* points to dev_local by default */
        struct sysfs_device dev_local;
+       struct sysfs_device *dev_parent;        /* current parent device used for matching */
        char action[NAME_SIZE];
 
        /* node */
@@ -112,14 +114,14 @@ 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, struct udevice *udev_old);
+extern void udev_node_remove_symlinks(struct udevice *udev);
+extern int udev_node_remove(struct udevice *udev);
 
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
@@ -134,8 +136,8 @@ struct name_entry {
        char name[PATH_SIZE];
 };
 extern int log_priority(const char *priority);
-extern int name_list_add(struct list_head *name_list, const char *name, int sort);
-extern int name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern char *name_list_add(struct list_head *name_list, const char *name, int sort);
+extern char *name_list_key_add(struct list_head *name_list, const char *key, const char *value);
 extern void name_list_cleanup(struct list_head *name_list);
 extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);