X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=94fdf4ac9191baf6982b543d1e42ad0d886c266d;hb=72ffa78debb1f96488b5e13d3151486563b460e7;hp=9d612dfe0cfd741085105c61c88ae47bf48eee5d;hpb=cb32ac946fe3606fa5bfeb0b26589a3b0f2e0c45;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 9d612dfe0..94fdf4ac9 100644
--- a/namedev.h
+++ b/namedev.h
@@ -23,15 +23,11 @@
 #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 */
@@ -39,6 +35,7 @@ enum config_type {
 	NUMBER		= 2,
 	TOPOLOGY	= 3,
 	REPLACE		= 4,
+	CALLOUT		= 5,
 };
 
 #define BUS_SIZE	30
@@ -47,25 +44,43 @@ 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 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];
+
 	/* what to set the device to */
-	struct device_attr attr;
+	char name[NAME_SIZE];
+	char owner[OWNER_SIZE];
+	char group[GROUP_SIZE];
+	mode_t mode;
 };
 
+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 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 void dump_config_dev(struct config_device *dev);
+extern void dump_config_dev_list(void);
+
+extern int get_pair(char **orig_string, char **left, char **right);
 
 #endif