X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=5ea843e9b74d2645857c50ca00ab825830bf92d8;hb=f7b4eca455c7dbf850d984892756f22dbd9ddc3d;hp=d986a2376d36249b96fcb876a28ed7b7ad644f47;hpb=8e41d35d7675b7d47db3e27da4e1fd508d772c32;p=elogind.git

diff --git a/namedev.h b/namedev.h
index d986a2376..5ea843e9b 100644
--- a/namedev.h
+++ b/namedev.h
@@ -28,11 +28,7 @@
 
 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 */
@@ -40,6 +36,7 @@ enum config_type {
 	NUMBER		= 2,
 	TOPOLOGY	= 3,
 	REPLACE		= 4,
+	CALLOUT		= 5,
 };
 
 #define BUS_SIZE	30
@@ -53,20 +50,23 @@ 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 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);
 
 #endif