X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=d031b9699c99f6beac79fe897d3924a634a02518;hp=d049fc1fd04bb3dcd446c8ede0b12d003a61182c;hb=af4b05d4917fdfa55eff3d8d53a830464d8162a1;hpb=aee380b6d8f849c21a5cc54e5d8f2a43fb88b2f2

diff --git a/udev.h b/udev.h
index d049fc1fd..d031b9699 100644
--- a/udev.h
+++ b/udev.h
@@ -26,11 +26,12 @@
 #include <sys/param.h>
 #include "libsysfs/sysfs/libsysfs.h"
 
+#define ALARM_TIMEOUT			120
 #define COMMENT_CHARACTER		'#'
 
 #define NAME_SIZE			256
-#define OWNER_SIZE			30
-#define GROUP_SIZE			30
+#define OWNER_SIZE			32
+#define GROUP_SIZE			32
 #define MODE_SIZE			8
 
 #define ACTION_SIZE			32
@@ -40,48 +41,41 @@
 
 #define LINE_SIZE			256
 
-#define FAKE				1
-#define NOFAKE				0
-
-/* length of public data */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
-
 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 type;
 	int major;
 	int minor;
-	unsigned int mode;	/* not mode_t due to conflicting definitions in different libcs */
+	mode_t mode;
 	char symlink[NAME_SIZE];
 	int partitions;
 	int config_line;
 	char config_file[NAME_SIZE];
 	long config_uptime;
-
-	/* private data that help us in building strings */
 	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;
 };
 
-extern int udev_add_device(const char *path, const char *subsystem, int fake);
-extern int udev_remove_device(const char *path, const char *subsystem);
+extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev);
+extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
-extern int __udev_hotplug(char *action, const char *devpath,
-	const char *subsystem);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_send(struct udevice *dev, const char *subsystem,
-	const char *devpath);
+extern void dev_d_execute(struct udevice *udev);
 
-extern char **main_argv;
-extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
 extern char udev_root[PATH_MAX];
-extern char udev_db_filename[PATH_MAX+NAME_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];
@@ -89,7 +83,6 @@ extern char default_mode_str[MODE_SIZE];
 extern char default_owner_str[OWNER_SIZE];
 extern char default_group_str[GROUP_SIZE];
 extern int udev_log;
-extern int udev_sleep;
 extern int udev_dev_d;
 
 #endif