X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=a8be0ed4005d1cda9434db6aa7522edcbeba6a64;hb=8815afa1df0dbb0b366156d4cebc56468906118c;hp=c6f26b3bfbde2d999457ed79f28519c00e4da79c;hpb=c974742bf4d6d8fab1e1c90e2e57dae0a2f297a1;p=elogind.git

diff --git a/udev.h b/udev.h
index c6f26b3bf..a8be0ed40 100644
--- a/udev.h
+++ b/udev.h
@@ -29,9 +29,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 
-#define ALARM_TIMEOUT			120
 #define COMMENT_CHARACTER		'#'
-
 #define LINE_SIZE			512
 #define NAME_SIZE			128
 #define PATH_SIZE			256
@@ -39,13 +37,8 @@
 #define SEQNUM_SIZE			32
 #define VALUE_SIZE			128
 
-#define DEVD_DIR			"/etc/dev.d"
-#define DEVD_SUFFIX			".dev"
-
-#define HOTPLUGD_DIR			"/etc/hotplug.d"
-#define HOTPLUG_SUFFIX			".hotplug"
-
 #define DEFAULT_PARTITIONS_COUNT	15
+#define UDEV_ALARM_TIMEOUT		120
 
 enum device_type {
 	DEV_UNKNOWN,
@@ -62,6 +55,7 @@ struct udevice {
 
 	enum device_type type;
 	char name[PATH_SIZE];
+	int name_set;
 	char devname[PATH_SIZE];
 	struct list_head symlink_list;
 	int symlink_final;
@@ -74,6 +68,7 @@ struct udevice {
 	dev_t devt;
 	struct list_head run_list;
 	int run_final;
+	struct list_head env_list;
 
 	char tmp_node[PATH_SIZE];
 	int partitions;
@@ -92,7 +87,6 @@ extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *clas
 extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 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[PATH_SIZE];
@@ -102,7 +96,5 @@ 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;
 
 #endif