[PATCH] remove udev_dbus.h from Makefile

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 1405d07e04ea8a301b9649a6ae11f5a86a330145..68100d4f62e81271aeb0234d5cac10c990221e85 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
@@ -28,58 +28,87 @@
 
 struct sysfs_class_device;
 
-#define COMMENT_CHARACTER              '#'
+#define BUS_SIZE               30
+#define FILE_SIZE              50
+#define VALUE_SIZE             100
+#define ID_SIZE                        50
+#define PLACE_SIZE             50
+#define PROGRAM_SIZE           100
 
-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 FIELD_BUS              "BUS"
+#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 FIELD_OWNER            "OWNER"
+#define FIELD_GROUP            "GROUP"
+#define FIELD_MODE             "MODE"
+
+#define ATTR_PARTITIONS                "all_partitions"
+#define PARTITIONS_COUNT       15
+
+#define MAX_SYSFS_PAIRS                5
 
-#define BUS_SIZE       30
-#define FILE_SIZE      50
-#define VALUE_SIZE     100
-#define ID_SIZE                50
-#define PLACE_SIZE     50
+#define RULEFILE_EXT           ".rules"
+#define PERMFILE_EXT           ".permissions"
 
-#define TYPE_LABEL     "LABEL"
-#define TYPE_NUMBER    "NUMBER"
-#define TYPE_TOPOLOGY  "TOPOLOGY"
-#define TYPE_REPLACE   "REPLACE"
-#define TYPE_CALLOUT   "CALLOUT"
-#define CALLOUT_MAXARG 8
+#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];
+       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];
+       char owner[OWNER_SIZE];
+       char group[GROUP_SIZE];
+       unsigned int mode;
+       int partitions;
+       char config_file[NAME_SIZE];
+       int config_line;
+};
+
+struct perm_device {
+       struct list_head node;
 
-       /* what to set the device to */
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
-       mode_t mode;
+       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 sysfs_class_device *class_dev, struct udevice *dev);
 extern int namedev_init_permissions(void);
-extern int namedev_init_config(void);
+extern int namedev_init_rules(void);
 
-extern int add_config_dev(struct config_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);
 
 #endif