X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=8a3569ec7cd92cd43d9e2712677c1ecdc69b3fa7;hb=045b1f0f7a7af2182e7109f472d873f1cc0c5e4b;hp=68100d4f62e81271aeb0234d5cac10c990221e85;hpb=35b38379bac87ebf4d0cc6884feff588ee859d5f;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 68100d4f6..8a3569ec7 100644
--- a/namedev.h
+++ b/namedev.h
@@ -28,12 +28,13 @@
 
 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 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"
@@ -42,6 +43,8 @@ struct sysfs_class_device;
 #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"
@@ -49,20 +52,12 @@ struct sysfs_class_device;
 #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_EXT		".rules"
-#define PERMFILE_EXT		".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);
+#define RULEFILE_SUFFIX		".rules"
 
 struct sysfs_pair {
 	char file[FILE_SIZE];
@@ -78,37 +73,26 @@ 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;
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
+	mode_t mode;
 	int partitions;
+	int ignore_remove;
 	char config_file[NAME_SIZE];
 	int config_line;
 };
 
-struct perm_device {
-	struct list_head node;
-
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-	unsigned int mode;
-};
-
 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_init_permissions(void);
-extern int namedev_init_rules(void);
+extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_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);
-extern void dump_perm_dev_list(void);
 
 #endif