rules_generator: remove policy from write_cd_rules

[elogind.git] / udev_rules.h

diff --git a/udev_rules.h b/udev_rules.h
index 6d9d306dedc60e42b0b4ebb54bd5ec8a761f4e3d..0ad4ec3271b4446465c37b0d1dde2d721802487b 100644 (file)
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -1,8 +1,6 @@
 /*
- * udev_rules.h
- *
  * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -15,19 +13,18 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #ifndef UDEV_RULES_H
 #define UDEV_RULES_H
 
-#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "list.h"
 
 #define PAIRS_MAX              5
-#define RULEFILE_SUFFIX                ".rules"
+#define RULESFILE_SUFFIX       ".rules"
 
 enum key_operation {
        KEY_OP_UNSET,
@@ -60,35 +57,50 @@ enum import_type {
        IMPORT_PARENT,
 };
 
+enum escape_type {
+       ESCAPE_UNSET,
+       ESCAPE_NONE,
+       ESCAPE_REPLACE,
+};
+
 struct udev_rule {
-       struct key label;
-       struct key goto_label;
-       struct key kernel_name;
-       struct key subsystem;
        struct key action;
        struct key devpath;
-       struct key bus;
-       struct key id;
+       struct key kernel;
+       struct key subsystem;
        struct key driver;
+       struct key_pairs attr;
+
+       struct key kernels;
+       struct key subsystems;
+       struct key drivers;
+       struct key_pairs attrs;
+
+       struct key_pairs env;
        struct key program;
        struct key result;
-       struct key modalias;
        struct key import;
        enum import_type import_type;
+       struct key test;
+       mode_t test_mode_mask;
+       struct key run;
        struct key wait_for_sysfs;
-       struct key_pairs sysfs;
-       struct key_pairs env;
+       struct key label;
+       struct key goto_label;
 
        struct key name;
        struct key symlink;
-       struct key run;
+       struct key symlink_match;
        struct key owner;
        struct key group;
-       enum key_operation mode_operation;
        mode_t mode;
+       enum key_operation mode_operation;
+       enum escape_type string_escape;
 
+       unsigned int link_priority;
        unsigned int partitions;
        unsigned int last_rule:1,
+                    run_ignore_error:1,
                     ignore_device:1,
                     ignore_remove:1;
 
@@ -104,18 +116,16 @@ struct udev_rules {
 };
 
 extern int udev_rules_init(struct udev_rules *rules, int resolve_names);
-extern void udev_rules_close(struct udev_rules *rules);
-
-extern void udev_apply_format(struct udevice *udev, char *string, size_t maxsize,
-                             struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device);
+extern void udev_rules_cleanup(struct udev_rules *rules);
 
 extern void udev_rules_iter_init(struct udev_rules *rules);
 extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules);
 extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *label);
 
-extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev,
-                              struct sysfs_class_device *class_dev);
-extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev,
-                             struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_dev);
+extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev);
+extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev);
+extern int udev_rules_run(struct udevice *udev);
+
+extern void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize);
 
 #endif