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

diff --git a/namedev.h b/namedev.h
index 0e3a81995..5ea843e9b 100644
--- a/namedev.h
+++ b/namedev.h
@@ -23,15 +23,50 @@
 #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 */
+	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
+
+
+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 */
+	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