[PATCH] add IGNORE rule type

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 567756c827f0931d7a31bcb824e09cf135e13533..f1e770277b1640c0b2bf2a72cfe4c1d72e6c26de 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -28,10 +28,6 @@
 
 struct sysfs_class_device;
 
-/* namedev config files */
-#define COMMENT_CHARACTER              '#'
-#define NAMEDEV_CONFIG_PERMISSION_FILE "namedev.permissions"
-#define NAMEDEV_CONFIG_FILE            "namedev.config"
 
 enum config_type {
        KERNEL_NAME     = 0,    /* must be 0 to let memset() default to this value */
@@ -40,6 +36,7 @@ enum config_type {
        TOPOLOGY        = 3,
        REPLACE         = 4,
        CALLOUT         = 5,
+       IGNORE          = 6,
 };
 
 #define BUS_SIZE       30
@@ -47,27 +44,69 @@ enum config_type {
 #define VALUE_SIZE     100
 #define ID_SIZE                50
 #define PLACE_SIZE     50
+#define PROGRAM_SIZE   100
 
+#define TYPE_LABEL     "LABEL"
+#define TYPE_NUMBER    "NUMBER"
+#define TYPE_TOPOLOGY  "TOPOLOGY"
+#define TYPE_REPLACE   "REPLACE"
+#define TYPE_CALLOUT   "CALLOUT"
+#define TYPE_IGNORE    "IGNORE"
+
+#define FIELD_BUS      "BUS"
+#define FIELD_ID       "ID"
+#define FIELD_SYSFS    "SYSFS_"
+#define FIELD_PLACE    "PLACE"
+#define FIELD_PROGRAM  "PROGRAM"
+#define FIELD_KERNEL   "KERNEL"
+#define FIELD_NAME     "NAME"
+#define FIELD_SYMLINK  "SYMLINK"
+
+#define CALLOUT_MAXARG 8
+#define MAX_SYSFS_PAIRS        5
+
+struct sysfs_pair {
+       char file[FILE_SIZE];
+       char value[VALUE_SIZE];
+};
 
 struct config_device {
        struct list_head node;
 
        enum config_type type;
-
        char bus[BUS_SIZE];
-       char sysfs_file[FILE_SIZE];
-       char sysfs_value[VALUE_SIZE];
        char id[ID_SIZE];
        char place[PLACE_SIZE];
        char kernel_name[NAME_SIZE];
-       char exec_program[FILE_SIZE];
-       
-       /* what to set the device to */
-       struct device_attr attr;
+       char exec_program[PROGRAM_SIZE];
+       char name[NAME_SIZE];
+       char symlink[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
 };
 
+struct perm_device {
+       struct list_head node;
+
+       char name[NAME_SIZE];
+       char owner[OWNER_SIZE];
+       char group[GROUP_SIZE];
+       mode_t 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 sysfs_class_device *class_dev, struct device_attr *attr);
+extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *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);
+extern void dump_perm_dev_list(void);
+
+extern int get_pair(char **orig_string, char **left, char **right);
 
 #endif