[PATCH] trivial namedev cleanup

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 3837e864a0049e4c70d2f60f0c3c9ecd8deebe64..a929e527561ba5ee0a5dd049187824c32a728654 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -28,12 +28,13 @@
 
 struct sysfs_class_device;
 
-#define BUS_SIZE               30
-#define FILE_SIZE              50
-#define VALUE_SIZE             100
-#define ID_SIZE                        50
-#define PLACE_SIZE             50
-#define PROGRAM_SIZE           100
+#define BUS_SIZE               32
+#define FILE_SIZE              64
+#define VALUE_SIZE             128
+#define ID_SIZE                        64
+#define PLACE_SIZE             64
+#define DRIVER_SIZE            64
+#define PROGRAM_SIZE           128
 
 #define FIELD_BUS              "BUS"
 #define FIELD_SYSFS            "SYSFS"
@@ -43,27 +44,21 @@ struct sysfs_class_device;
 #define FIELD_RESULT           "RESULT"
 #define FIELD_KERNEL           "KERNEL"
 #define FIELD_SUBSYSTEM                "SUBSYSTEM"
+#define FIELD_DRIVER           "DRIVER"
 #define FIELD_NAME             "NAME"
 #define FIELD_SYMLINK          "SYMLINK"
 #define FIELD_OWNER            "OWNER"
 #define FIELD_GROUP            "GROUP"
 #define FIELD_MODE             "MODE"
+#define FIELD_OPTIONS          "OPTIONS"
 
+#define ATTR_IGNORE_DEVICE     "ignore_device"
+#define ATTR_IGNORE_REMOVE     "ignore_remove"
 #define ATTR_PARTITIONS                "all_partitions"
-#define PARTITIONS_COUNT       15
 
 #define MAX_SYSFS_PAIRS                5
 
 #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];
@@ -73,44 +68,37 @@ struct sysfs_pair {
 struct config_device {
        struct list_head node;
 
+       char kernel[NAME_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
        char bus[BUS_SIZE];
        char id[ID_SIZE];
        char place[PLACE_SIZE];
-       char kernel[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
        char program[PROGRAM_SIZE];
        char result[PROGRAM_SIZE];
-       char subsystem[SUBSYSTEM_SIZE];
+       char driver[DRIVER_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;
+
+       char owner[USER_SIZE];
+       char group[USER_SIZE];
+       mode_t mode;
+
        int partitions;
+       int ignore_device;
+       int ignore_remove;
+
        char config_file[NAME_SIZE];
        int config_line;
 };
 
-struct perm_device {
-       struct list_head node;
-
-       char name[NAME_SIZE];
-       char owner[OWNER_SIZE];
-       char group[GROUP_SIZE];
-       unsigned int mode;
-};
-
 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 udevice *udev, struct sysfs_class_device *class_dev);
-extern int namedev_init_permissions(void);
-extern int namedev_init_rules(void);
+extern void namedev_close(void);
 
 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);
-extern void dump_perm_dev_list(void);
 
 #endif