X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=1e1a9bbc3450013a7dafe306c3e965b9e637e3f2;hb=8f2f6e426fc4cc1fa39b864a1792428a4269b751;hp=7a98d66c24ca42c2b5f964c2751c6eac8610ab8d;hpb=2092fbcdebf5313f29b43bdaa57a22baf0c0269f;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 7a98d66c2..1e1a9bbc3 100644
--- a/namedev.h
+++ b/namedev.h
@@ -50,22 +50,15 @@ struct sysfs_class_device;
 #define FIELD_OWNER		"OWNER"
 #define FIELD_GROUP		"GROUP"
 #define FIELD_MODE		"MODE"
+#define FIELD_OPTIONS		"OPTIONS"
 
+#define ATTR_IGNORE_DEVICE	"ignore_device"
+#define ATTR_IGNORE_REMOVE	"ignore_remove"
 #define ATTR_PARTITIONS		"all_partitions"
-#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];
@@ -86,34 +79,26 @@ struct config_device {
 	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_device;
+	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 udevice *udev, struct sysfs_class_device *class_dev);
-extern int namedev_init_permissions(void);
-extern int namedev_init_rules(void);
+extern void namedev_close(void);
 
 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