X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=80eafb0d46a25e7318b67f38fe0529c50ad789a6;hp=e834f1e5b9008fa478fbbc7b062ddb0aed6488a1;hb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404;hpb=d07557b9b6ba72f50c6b80ea06cecac61cf9eeb1

diff --git a/udev.h b/udev.h
index e834f1e5b..80eafb0d4 100644
--- a/udev.h
+++ b/udev.h
@@ -30,16 +30,14 @@
 #define COMMENT_CHARACTER		'#'
 
 #define NAME_SIZE			256
-#define OWNER_SIZE			32
-#define GROUP_SIZE			32
-#define MODE_SIZE			8
+#define USER_SIZE			32
 
 #define ACTION_SIZE			32
 #define DEVPATH_SIZE			256
 #define SUBSYSTEM_SIZE			32
 #define SEQNUM_SIZE			32
 
-#define LINE_SIZE			256
+#define LINE_SIZE			512
 
 #define DEVD_DIR			"/etc/dev.d"
 #define DEVD_SUFFIX			".dev"
@@ -50,26 +48,25 @@
 struct udevice {
 	char devpath[DEVPATH_SIZE];
 	char subsystem[SUBSYSTEM_SIZE];
-	char action[ACTION_SIZE];
+
 	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
+	char symlink[NAME_SIZE];
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
+	mode_t mode;
 	char type;
 	int major;
 	int minor;
-	mode_t mode;
-	char symlink[NAME_SIZE];
+
+	char devname[NAME_SIZE];
 	int partitions;
 	int ignore_remove;
 	int config_line;
 	char config_file[NAME_SIZE];
-	long config_uptime;
 	char bus_id[SYSFS_NAME_LEN];
-	char bus[SYSFS_NAME_LEN];
 	char program_result[NAME_SIZE];
 	char kernel_number[NAME_SIZE];
 	char kernel_name[NAME_SIZE];
-	char devname[NAME_SIZE];
 	int test_run;
 };
 
@@ -77,19 +74,18 @@ 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 int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix);
+extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
 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_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern char default_mode_str[MODE_SIZE];
-extern char default_owner_str[OWNER_SIZE];
-extern char default_group_str[GROUP_SIZE];
+extern mode_t default_mode;
+extern char default_owner[USER_SIZE];
+extern char default_group[USER_SIZE];
 extern int udev_log;
 extern int udev_dev_d;
+extern int udev_hotplug_d;
 
 #endif