[PATCH] support SUBSYSTEM as a rule key

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index ffdde83ca4843058d08f3f7b172b360a4426944e..3837e864a0049e4c70d2f60f0c3c9ecd8deebe64 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -42,17 +42,28 @@ 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"
+#define FIELD_GROUP            "GROUP"
+#define FIELD_MODE             "MODE"
 
 #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)                     \
+               dev->mode = m;                  \
+       if (dev->owner[0] == '\0')              \
+               strfieldcpy(dev->owner, o);     \
+       if (dev->group[0] == '\0')              \
+               strfieldcpy(dev->group, g);
 
 struct sysfs_pair {
        char file[FILE_SIZE];
@@ -68,10 +79,15 @@ 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];
+       char owner[OWNER_SIZE];
+       char group[GROUP_SIZE];
+       unsigned int mode;
        int partitions;
+       char config_file[NAME_SIZE];
        int config_line;
 };
 
@@ -88,11 +104,10 @@ 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);
 
-extern int add_perm_dev(struct perm_device *new_dev);
 extern void dump_config_dev(struct config_device *dev);
 extern void dump_config_dev_list(void);
 extern void dump_perm_dev(struct perm_device *dev);