X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules.h;h=14e40abc2ca4c5b34ee04f7a101db61081ecc637;hb=a0e5382d66567cc91c1a1f571e9fb5288106e876;hp=5fba2d55714ca67903a2d73279fc462807411623;hpb=821d0ec803a72841f173739f5b713fe847edab75;p=elogind.git

diff --git a/udev_rules.h b/udev_rules.h
index 5fba2d557..14e40abc2 100644
--- 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"
@@ -62,6 +65,7 @@ enum key_operation {
 	KEY_OP_NOMATCH,
 	KEY_OP_ADD,
 	KEY_OP_ASSIGN,
+	KEY_OP_ASSIGN_FINAL,
 };
 
 struct key_pair {
@@ -73,12 +77,14 @@ struct key_pair {
 struct udev_rule {
 	struct list_head node;
 
-	char kernel[NAME_SIZE];
+	char kernel_name[NAME_SIZE];
 	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];
@@ -93,13 +99,24 @@ 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;
 	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;
@@ -110,11 +127,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 int udev_rules_get_run(struct udevice *udev);
 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