[PATCH] remove PLACE key match

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 9d612dfe0cfd741085105c61c88ae47bf48eee5d..d0235996bc22fcf755d0f11bc9204a6f5612dd22 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -23,49 +23,72 @@
 #ifndef NAMEDEV_H
 #define NAMEDEV_H
 
+#include "udev.h"
 #include "list.h"
 
 struct sysfs_class_device;
 
-/* namedev config files */
-#define COMMENT_CHARACTER              '#'
-#define NAMEDEV_CONFIG_ROOT            "/home/greg/src/udev/"
-#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 */
-       LABEL           = 1,
-       NUMBER          = 2,
-       TOPOLOGY        = 3,
-       REPLACE         = 4,
-};
+#define FIELD_KERNEL           "KERNEL"
+#define FIELD_SUBSYSTEM                "SUBSYSTEM"
+#define FIELD_BUS              "BUS"
+#define FIELD_SYSFS            "SYSFS"
+#define FIELD_ID               "ID"
+#define FIELD_PROGRAM          "PROGRAM"
+#define FIELD_RESULT           "RESULT"
+#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 OPTION_IGNORE_DEVICE   "ignore_device"
+#define OPTION_IGNORE_REMOVE   "ignore_remove"
+#define OPTION_PARTITIONS      "all_partitions"
 
-#define BUS_SIZE       30
-#define FILE_SIZE      50
-#define VALUE_SIZE     100
-#define ID_SIZE                50
-#define PLACE_SIZE     50
+#define MAX_SYSFS_PAIRS                5
 
+#define RULEFILE_SUFFIX                ".rules"
+
+struct sysfs_pair {
+       char file[PATH_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];
-       
-       /* what to set the device to */
-       struct device_attr attr;
+       char kernel[NAME_SIZE];
+       char subsystem[NAME_SIZE];
+       char bus[NAME_SIZE];
+       char id[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+       char program[PATH_SIZE];
+       char result[PATH_SIZE];
+       char driver[NAME_SIZE];
+       char name[PATH_SIZE];
+       char symlink[PATH_SIZE];
+
+       char owner[USER_SIZE];
+       char group[USER_SIZE];
+       mode_t mode;
+
+       int partitions;
+       int ignore_device;
+       int ignore_remove;
+
+       char config_file[PATH_SIZE];
+       int config_line;
 };
 
+extern struct list_head config_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 udevice *udev, struct sysfs_class_device *class_dev);
+extern void namedev_close(void);
+
+extern void dump_config_dev(struct config_device *dev);
+extern void dump_config_dev_list(void);
 
 #endif