X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=1e3db5af27e95c4309e4ec24096ee43e8ba2f73c;hb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;hp=e5c983a212c1eb84c6ef6c3e778c29e1dc44bc1b;hpb=765cbd97599d943adc73d03f4c91bd7cf7ef7fab;p=elogind.git

diff --git a/udev.h b/udev.h
index e5c983a21..1e3db5af2 100644
--- a/udev.h
+++ b/udev.h
@@ -20,20 +20,37 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/libsysfs.h"
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
+#define ALARM_TIMEOUT			120
 #define COMMENT_CHARACTER		'#'
 
-#define NAME_SIZE	100
-#define OWNER_SIZE	30
-#define GROUP_SIZE	30
-#define MODE_SIZE	8
+#define NAME_SIZE			256
+#define OWNER_SIZE			32
+#define GROUP_SIZE			32
+#define MODE_SIZE			8
+
+#define ACTION_SIZE			32
+#define DEVPATH_SIZE			256
+#define SUBSYSTEM_SIZE			32
+#define SEQNUM_SIZE			32
+
+#define LINE_SIZE			256
+
+#define DEVD_DIR			"/etc/dev.d"
+#define DEVD_SUFFIX			".dev"
+
+#define HOTPLUGD_DIR			"/etc/hotplug.d"
+#define HOTPLUG_SUFFIX			".hotplug"
 
 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];
@@ -42,34 +59,37 @@ struct udevice {
 	int minor;
 	mode_t mode;
 	char symlink[NAME_SIZE];
-
-	/* fields that help us in building strings */
-	unsigned char bus_id[SYSFS_NAME_LEN];
-	unsigned char program_result[NAME_SIZE];
-	unsigned char kernel_number[NAME_SIZE];
-	unsigned char kernel_name[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;
 };
 
-#define strfieldcpy(to, from) \
-do { \
-	to[sizeof(to)-1] = '\0'; \
-	strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-extern int udev_add_device(char *path, char *subsystem);
-extern int udev_remove_device(char *path, 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 parse_get_pair(char **orig_string, char **left, char **right);
+extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
-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];
 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_dev_d;
 
 #endif