X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=namedev.h;h=d5aaae202cf28e4fa7eefb9f6a9b5e26850ae45f;hb=eb13ff87074f0a8dec135e4cb476585fe29bf49b;hp=9d612dfe0cfd741085105c61c88ae47bf48eee5d;hpb=cb32ac946fe3606fa5bfeb0b26589a3b0f2e0c45;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 9d612dfe0..d5aaae202 100644
--- a/namedev.h
+++ b/namedev.h
@@ -23,15 +23,12 @@
 #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 +36,7 @@ enum config_type {
 	NUMBER		= 2,
 	TOPOLOGY	= 3,
 	REPLACE		= 4,
+	CALLOUT		= 5,
 };
 
 #define BUS_SIZE	30
@@ -59,6 +57,7 @@ struct config_device {
 	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;