X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=d0235996bc22fcf755d0f11bc9204a6f5612dd22;hp=e38c4f525741b0d4bdfd2616c50715f0a735d7d6;hb=882af735ec18cb4e6ba6f59ca60f8266cc96c330;hpb=bb7386472466e55f75df024d18e8da37a222bb41

diff --git a/namedev.h b/namedev.h
index e38c4f525..d0235996b 100644
--- a/namedev.h
+++ b/namedev.h
@@ -28,67 +28,67 @@
 
 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 FIELD_KERNEL		"KERNEL"
+#define FIELD_SUBSYSTEM		"SUBSYSTEM"
+#define FIELD_BUS		"BUS"
+#define FIELD_SYSFS		"SYSFS"
+#define FIELD_ID		"ID"
+#define FIELD_PROGRAM		"PROGRAM"
+#define FIELD_RESULT		"RESULT"
+#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 FIELD_OPTIONS		"OPTIONS"
+
+#define OPTION_IGNORE_DEVICE	"ignore_device"
+#define OPTION_IGNORE_REMOVE	"ignore_remove"
+#define OPTION_PARTITIONS	"all_partitions"
+
+#define MAX_SYSFS_PAIRS		5
+
+#define RULEFILE_SUFFIX		".rules"
 
 struct sysfs_pair {
-	char file[FILE_SIZE];
+	char file[PATH_SIZE];
 	char value[VALUE_SIZE];
 };
 
 struct config_device {
 	struct list_head node;
 
-	char bus[BUS_SIZE];
-	char id[ID_SIZE];
-	char place[PLACE_SIZE];
 	char kernel[NAME_SIZE];
-	char program[PROGRAM_SIZE];
-	char result[PROGRAM_SIZE];
-	char name[NAME_SIZE];
-	char symlink[NAME_SIZE];
+	char subsystem[NAME_SIZE];
+	char bus[NAME_SIZE];
+	char id[NAME_SIZE];
 	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
-	int config_line;
-};
+	char program[PATH_SIZE];
+	char result[PATH_SIZE];
+	char driver[NAME_SIZE];
+	char name[PATH_SIZE];
+	char symlink[PATH_SIZE];
 
-struct perm_device {
-	struct list_head node;
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
+	mode_t mode;
 
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-	unsigned int mode;
+	int partitions;
+	int ignore_device;
+	int ignore_remove;
+
+	char config_file[PATH_SIZE];
+	int config_line;
 };
 
 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 namedev_close(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);
-extern void dump_perm_dev_list(void);
 
 #endif