X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=f7a65c60d826cacf57d3da99f3fe9c6e80928286;hp=f1236194d6367d3ac9b48b05b324090de2223181;hb=27a71e49c208a10eed83d5b37dc89d20429ea714;hpb=f0308095c78fd68c29be9b3b391bc1c077afa04c

diff --git a/udev.h b/udev.h
index f1236194d..f7a65c60d 100644
--- a/udev.h
+++ b/udev.h
@@ -33,13 +33,11 @@
 #define COMMENT_CHARACTER		'#'
 
 #define LINE_SIZE			512
-#define NAME_SIZE			256
+#define NAME_SIZE			128
+#define PATH_SIZE			256
 #define USER_SIZE			32
-
-#define ACTION_SIZE			32
-#define DEVPATH_SIZE			256
-#define SUBSYSTEM_SIZE			32
 #define SEQNUM_SIZE			32
+#define VALUE_SIZE			128
 
 #define DEVD_DIR			"/etc/dev.d"
 #define DEVD_SUFFIX			".dev"
@@ -50,33 +48,36 @@
 #define DEFAULT_PARTITIONS_COUNT	15
 
 enum device_type {
-	UNKNOWN,
-	CLASS,
-	BLOCK,
-	NET,
-	PHYSDEV,
+	DEV_UNKNOWN,
+	DEV_CLASS,
+	DEV_BLOCK,
+	DEV_NET,
+	DEV_DEVICE,
 };
 
 struct udevice {
-	char devpath[DEVPATH_SIZE];
-	char subsystem[SUBSYSTEM_SIZE];
+	char devpath[PATH_SIZE];
+	char subsystem[NAME_SIZE];
+	char action[NAME_SIZE];
 
-	char name[NAME_SIZE];
-	char devname[NAME_SIZE];
-	char symlink[NAME_SIZE];
+	enum device_type type;
+	char name[PATH_SIZE];
+	char devname[PATH_SIZE];
+	struct list_head symlink_list;
 	char owner[USER_SIZE];
 	char group[USER_SIZE];
 	mode_t mode;
-	char type;
 	dev_t devt;
+	struct list_head run_list;
 
-	char tmp_node[NAME_SIZE];
+	char tmp_node[PATH_SIZE];
 	int partitions;
+	int ignore_device;
 	int ignore_remove;
 	int config_line;
-	char config_file[NAME_SIZE];
-	char bus_id[SYSFS_NAME_LEN];
-	char program_result[NAME_SIZE];
+	char config_file[PATH_SIZE];
+	char bus_id[NAME_SIZE];
+	char program_result[PATH_SIZE];
 	char kernel_number[NAME_SIZE];
 	char kernel_name[NAME_SIZE];
 	int test_run;
@@ -89,12 +90,13 @@ extern int udev_start(void);
 extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 extern int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
 
-extern char sysfs_path[SYSFS_PATH_MAX];
-extern char udev_root[PATH_MAX];
-extern char udev_db_path[PATH_MAX+NAME_MAX];
-extern char udev_config_filename[PATH_MAX+NAME_MAX];
-extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern int udev_log;
+extern char sysfs_path[PATH_SIZE];
+extern char udev_root[PATH_SIZE];
+extern char udev_db_path[PATH_SIZE];
+extern char udev_config_filename[PATH_SIZE];
+extern char udev_rules_filename[PATH_SIZE];
+extern int udev_log_priority;
+extern int udev_run;
 extern int udev_dev_d;
 extern int udev_hotplug_d;