X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=8e552c85684ba580a3f43ffc55ace21b5a089bd3;hb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;hp=a0cdba6b16f83570b50b8adb168cde47df0efaf0;hpb=d45ea2b70c0cba69b02dae81d696a8b4c05c1771;p=elogind.git

diff --git a/namedev.h b/namedev.h
index a0cdba6b1..8e552c856 100644
--- a/namedev.h
+++ b/namedev.h
@@ -28,25 +28,45 @@
 
 struct sysfs_class_device;
 
-#define BUS_SIZE	30
-#define FILE_SIZE	50
-#define VALUE_SIZE	100
-#define ID_SIZE		50
-#define PLACE_SIZE	50
-#define PROGRAM_SIZE	100
-
-#define FIELD_BUS	"BUS"
-#define FIELD_SYSFS	"SYSFS_"
-#define FIELD_ID	"ID"
-#define FIELD_PLACE	"PLACE"
-#define FIELD_PROGRAM	"PROGRAM"
-#define FIELD_RESULT	"RESULT"
-#define FIELD_KERNEL	"KERNEL"
-#define FIELD_NAME	"NAME"
-#define FIELD_SYMLINK	"SYMLINK"
-
-#define PROGRAM_MAXARG	10
-#define MAX_SYSFS_PAIRS	5
+#define BUS_SIZE		32
+#define FILE_SIZE		64
+#define VALUE_SIZE		128
+#define ID_SIZE			64
+#define PLACE_SIZE		64
+#define DRIVER_SIZE		64
+#define PROGRAM_SIZE		128
+
+#define FIELD_BUS		"BUS"
+#define FIELD_SYSFS		"SYSFS"
+#define FIELD_ID		"ID"
+#define FIELD_PLACE		"PLACE"
+#define FIELD_PROGRAM		"PROGRAM"
+#define FIELD_RESULT		"RESULT"
+#define FIELD_KERNEL		"KERNEL"
+#define FIELD_SUBSYSTEM		"SUBSYSTEM"
+#define FIELD_DRIVER		"DRIVER"
+#define FIELD_NAME		"NAME"
+#define FIELD_SYMLINK		"SYMLINK"
+#define FIELD_OWNER		"OWNER"
+#define FIELD_GROUP		"GROUP"
+#define FIELD_MODE		"MODE"
+
+#define ATTR_PARTITIONS		"all_partitions"
+#define ATTR_IGNORE_REMOVE	"ignore_remove"
+#define PARTITIONS_COUNT	15
+
+#define MAX_SYSFS_PAIRS		5
+
+#define RULEFILE_SUFFIX		".rules"
+#define PERMFILE_SUFFIX		".permissions"
+
+#define set_empty_perms(dev, m, o, g)		\
+	if (dev->mode == 0)			\
+		dev->mode = m;			\
+	if (dev->owner[0] == '\0')		\
+		strfieldcpy(dev->owner, o);	\
+	if (dev->group[0] == '\0')		\
+		strfieldcpy(dev->group, g);
 
 struct sysfs_pair {
 	char file[FILE_SIZE];
@@ -62,9 +82,17 @@ struct config_device {
 	char kernel[NAME_SIZE];
 	char program[PROGRAM_SIZE];
 	char result[PROGRAM_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
+	char driver[DRIVER_SIZE];
 	char name[NAME_SIZE];
 	char symlink[NAME_SIZE];
 	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+	char owner[OWNER_SIZE];
+	char group[GROUP_SIZE];
+	unsigned int mode;
+	int partitions;
+	int ignore_remove;
+	char config_file[NAME_SIZE];
 	int config_line;
 };
 
@@ -81,11 +109,10 @@ 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_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern int namedev_init_permissions(void);
 extern int namedev_init_rules(void);
 
-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);