X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=1eaf4fee4d9a2123adbe995b3ef4a74cbe0c535c;hp=567756c827f0931d7a31bcb824e09cf135e13533;hb=bbc1c767b21e17a51dbe1b5edb2c379c5fce7e95;hpb=6739707df53097ac378f8ff2f0aa694257e31da1

diff --git a/namedev.h b/namedev.h
index 567756c82..1eaf4fee4 100644
--- 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 */
@@ -48,26 +44,66 @@ enum config_type {
 #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 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 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