X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=39cf3ae64132c3f810169b85ed79524227dbaffd;hb=600ee7f73e5381764803725e68a0f953bd2f46fd;hp=0089b4d240a416157c1ab658bb95da3514ed3b3c;hpb=2232cac825e4f8b53273d16154309278cf639e3c;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 0089b4d24..39cf3ae64 100644
--- a/namedev.h
+++ b/namedev.h
@@ -23,12 +23,73 @@
 #ifndef NAMEDEV_H
 #define NAMEDEV_H
 
-/* 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"
+#include "udev.h"
+#include "list.h"
+
+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 CALLOUT_MAXARG	8
+
+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 name[NAME_SIZE];
+	char symlink[NAME_SIZE];
+};
+
+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 udevice *dev);
+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);
+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