X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=9cff3710d40554f86d7ee9de70bd8afb1cce8697;hp=0e3a819952bc4b3f556d85a89060a10866e789ef;hb=db8f5cf28c13fd7d81d1aa32fe8df6864a0a019f;hpb=19dc5d4ce15ad387031ec4e78dc615a9eb07dc08

diff --git a/namedev.h b/namedev.h
index 0e3a81995..9cff3710d 100644
--- 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,15 +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"
+#define BUS_SIZE	30
+#define FILE_SIZE	50
+#define VALUE_SIZE	100
+#define ID_SIZE		50
+#define PLACE_SIZE	50
+#define PROGRAM_SIZE	100
+
+#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 PROGRAM_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;
+
+	char bus[BUS_SIZE];
+	char id[ID_SIZE];
+	char place[PLACE_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];
+	int config_line;
+};
+
+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);
 
 #endif