[PATCH] support SUBSYSTEM as a rule key

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 16a8bffe97b5ab5d629da6a7d1a417a2928e6145..3837e864a0049e4c70d2f60f0c3c9ecd8deebe64 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -42,6 +42,7 @@ struct sysfs_class_device;
 #define FIELD_PROGRAM          "PROGRAM"
 #define FIELD_RESULT           "RESULT"
 #define FIELD_KERNEL           "KERNEL"
+#define FIELD_SUBSYSTEM                "SUBSYSTEM"
 #define FIELD_NAME             "NAME"
 #define FIELD_SYMLINK          "SYMLINK"
 #define FIELD_OWNER            "OWNER"
@@ -51,11 +52,10 @@ struct sysfs_class_device;
 #define ATTR_PARTITIONS                "all_partitions"
 #define PARTITIONS_COUNT       15
 
-#define PROGRAM_MAXARG         10
 #define MAX_SYSFS_PAIRS                5
 
-#define RULEFILE_EXT           ".rules"
-#define PERMFILE_EXT           ".permissions"
+#define RULEFILE_SUFFIX                ".rules"
+#define PERMFILE_SUFFIX                ".permissions"
 
 #define set_empty_perms(dev, m, o, g)          \
        if (dev->mode == 0)                     \
@@ -79,6 +79,7 @@ struct config_device {
        char kernel[NAME_SIZE];
        char program[PROGRAM_SIZE];
        char result[PROGRAM_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
        struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
@@ -103,7 +104,7 @@ extern struct list_head config_device_list;
 extern struct list_head perm_device_list;
 
 extern int namedev_init(void);
-extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
+extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern int namedev_init_permissions(void);
 extern int namedev_init_rules(void);