[PATCH] udev - drop all methods :)

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 69c488936d13cc25a3ea3d9d792b977871cb20e4..4e75db64107a7fe5c6e519bcbc08b3ab49e733f1 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -28,52 +28,43 @@
 
 struct sysfs_class_device;
 
-
-enum config_type {
-       KERNEL_NAME     = 0,    /* must be 0 to let memset() default to this value */
-       LABEL           = 1,
-       NUMBER          = 2,
-       TOPOLOGY        = 3,
-       REPLACE         = 4,
-       CALLOUT         = 5,
-};
-
 #define BUS_SIZE       30
 #define FILE_SIZE      50
 #define VALUE_SIZE     100
 #define ID_SIZE                50
 #define PLACE_SIZE     50
-
-#define TYPE_LABEL     "LABEL"
-#define TYPE_NUMBER    "NUMBER"
-#define TYPE_TOPOLOGY  "TOPOLOGY"
-#define TYPE_REPLACE   "REPLACE"
-#define TYPE_CALLOUT   "CALLOUT"
+#define PROGRAM_SIZE   100
 
 #define FIELD_BUS      "BUS"
-#define FIELD_ID       "ID"
 #define FIELD_SYSFS    "SYSFS_"
+#define FIELD_ID       "ID"
 #define FIELD_PLACE    "PLACE"
 #define FIELD_PROGRAM  "PROGRAM"
+#define FIELD_RESULT   "RESULT"
 #define FIELD_KERNEL   "KERNEL"
 #define FIELD_NAME     "NAME"
 #define FIELD_SYMLINK  "SYMLINK"
 
-#define CALLOUT_MAXARG 8
+#define CALLOUT_MAXARG 10
+#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 kernel[NAME_SIZE];
+       char program[PROGRAM_SIZE];
+       char result[PROGRAM_SIZE];
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
 };
 
 struct perm_device {
@@ -93,7 +84,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);