[PATCH] Keep udevstart from skipping devices without a 'dev' file

[elogind.git] / udev_rules.h

diff --git a/udev_rules.h b/udev_rules.h
index 75ffd5cb0f47b13ccb325910b7b979f896400384..bad8406cf486ba84ad766f2cb0ddddbe5c35634e 100644 (file)
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -31,6 +31,7 @@
 #define KEY_KERNEL             "KERNEL"
 #define KEY_SUBSYSTEM          "SUBSYSTEM"
 #define KEY_ACTION             "ACTION"
+#define KEY_DEVPATH            "DEVPATH"
 #define KEY_BUS                        "BUS"
 #define KEY_ID                 "ID"
 #define KEY_PROGRAM            "PROGRAM"
@@ -38,6 +39,8 @@
 #define KEY_DRIVER             "DRIVER"
 #define KEY_SYSFS              "SYSFS"
 #define KEY_ENV                        "ENV"
+#define KEY_MODALIAS           "MODALIAS"
+#define KEY_IMPORT             "IMPORT"
 #define KEY_NAME               "NAME"
 #define KEY_SYMLINK            "SYMLINK"
 #define KEY_OWNER              "OWNER"
@@ -80,6 +83,8 @@ struct udev_rule {
        enum key_operation subsystem_operation;
        char action[NAME_SIZE];
        enum key_operation action_operation;
+       char devpath[PATH_SIZE];
+       enum key_operation devpath_operation;
        char bus[NAME_SIZE];
        enum key_operation bus_operation;
        char id[NAME_SIZE];
@@ -94,6 +99,11 @@ struct udev_rule {
        int sysfs_pair_count;
        struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
        int env_pair_count;
+       char modalias[NAME_SIZE];
+       enum key_operation modalias_operation;
+       char import[PATH_SIZE];
+       enum key_operation import_operation;
+       int import_exec;
 
        char name[PATH_SIZE];
        enum key_operation name_operation;
@@ -117,11 +127,13 @@ struct udev_rule {
        int config_line;
 };
 
-extern struct list_head udev_rule_list;
-
 extern int udev_rules_init(void);
+extern void udev_rules_close(void);
+
+extern int udev_rules_iter_init(void);
+extern struct udev_rule *udev_rules_iter_next(void);
+
 extern int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device);
-extern void udev_rules_close(void);
 
 #endif