[PATCH] move the signal handling registration to after we have initialized enough...

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 69c488936d13cc25a3ea3d9d792b977871cb20e4..1ac71069ad219784d8c227610a7e911e1329a826 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -43,6 +43,7 @@ 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"
@@ -60,20 +61,25 @@ enum config_type {
 #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];
+       char exec_program[PROGRAM_SIZE];
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
 };
 
 struct perm_device {
@@ -93,7 +99,6 @@ extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udev
 extern int namedev_init_permissions(void);
 extern int namedev_init_rules(void);
 
-extern int add_config_dev(struct config_device *new_dev);
 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);