X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.h;h=f4b0a6f12f7fbadea225e9b883209575ed0fc104;hp=688d4798e16650120469f843e479794afa0fc745;hb=bd0ed2ffbec325512c3131ce0db896234e36c923;hpb=38285d23d702258d3b219532a9874555e797a292

diff --git a/udev_rules.h b/udev_rules.h
index 688d4798e..f4b0a6f12 100644
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -30,17 +30,23 @@
 
 #define KEY_KERNEL		"KERNEL"
 #define KEY_SUBSYSTEM		"SUBSYSTEM"
+#define KEY_ACTION		"ACTION"
+#define KEY_DEVPATH		"DEVPATH"
 #define KEY_BUS			"BUS"
-#define KEY_SYSFS		"SYSFS"
 #define KEY_ID			"ID"
 #define KEY_PROGRAM		"PROGRAM"
 #define KEY_RESULT		"RESULT"
 #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"
 #define KEY_GROUP		"GROUP"
 #define KEY_MODE		"MODE"
+#define KEY_RUN			"RUN"
 #define KEY_OPTIONS		"OPTIONS"
 
 #define OPTION_LAST_RULE	"last_rule"
@@ -48,20 +54,22 @@
 #define OPTION_IGNORE_REMOVE	"ignore_remove"
 #define OPTION_PARTITIONS	"all_partitions"
 
-#define MAX_SYSFS_PAIRS		5
+#define KEY_SYSFS_PAIRS_MAX	5
+#define KEY_ENV_PAIRS_MAX	5
 
 #define RULEFILE_SUFFIX		".rules"
 
 enum key_operation {
-	KEY_OP_UNKNOWN,
+	KEY_OP_UNSET,
 	KEY_OP_MATCH,
 	KEY_OP_NOMATCH,
 	KEY_OP_ADD,
 	KEY_OP_ASSIGN,
+	KEY_OP_ASSIGN_FINAL,
 };
 
-struct sysfs_pair {
-	char file[PATH_SIZE];
+struct key_pair {
+	char name[NAME_SIZE];
 	char value[VALUE_SIZE];
 	enum key_operation operation;
 };
@@ -73,6 +81,10 @@ struct udev_rule {
 	enum key_operation kernel_operation;
 	char subsystem[NAME_SIZE];
 	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];
@@ -83,13 +95,27 @@ struct udev_rule {
 	enum key_operation program_operation;
 	char result[PATH_SIZE];
 	enum key_operation result_operation;
-	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+	struct key_pair sysfs_pair[KEY_SYSFS_PAIRS_MAX];
+	int sysfs_pair_count;
+	struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
+	int env_pair_count;
+	enum key_operation modalias_operation;
+	char modalias[PATH_SIZE];
+	enum key_operation import_operation;
+	char import[PATH_SIZE];
 
 	char name[PATH_SIZE];
+	enum key_operation name_operation;
 	char symlink[PATH_SIZE];
+	enum key_operation symlink_operation;
 	char owner[USER_SIZE];
+	enum key_operation owner_operation;
 	char group[USER_SIZE];
+	enum key_operation group_operation;
 	mode_t mode;
+	enum key_operation mode_operation;
+	char run[PATH_SIZE];
+	enum key_operation run_operation;
 
 	int last_rule;
 	int ignore_device;
@@ -100,10 +126,13 @@ struct udev_rule {
 	int config_line;
 };
 
-extern struct list_head udev_rule_list;
-
 extern int udev_rules_init(void);
-extern int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev);
 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);
+
 #endif