X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=f7a13a634b77e75fff756248e0ca98df7579b0a2;hb=a9ce6041228c12aad06666904af8dbe3acfd3115;hp=1cd07852b41eea82e4361443e0694faba7b714e8;hpb=961e47847cdb33b1fabe4084cef7cd37f73a19d1;p=elogind.git

diff --git a/udev.h b/udev.h
index 1cd07852b..f7a13a634 100644
--- a/udev.h
+++ b/udev.h
@@ -20,22 +20,29 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/libsysfs.h"
-#include <stddef.h>
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
+#define ALARM_TIMEOUT			30
 #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			30
+#define GROUP_SIZE			30
+#define MODE_SIZE			8
 
-/* length of public data */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+#define ACTION_SIZE			32
+#define DEVPATH_SIZE			256
+#define SUBSYSTEM_SIZE			32
+#define SEQNUM_SIZE			32
+
+#define LINE_SIZE			256
+
+/* length of public data to store in udevdb */
+#define UDEVICE_DB_LEN (offsetof(struct udevice, devpath))
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -47,24 +54,28 @@ struct udevice {
 	unsigned int mode;	/* not mode_t due to conflicting definitions in different libcs */
 	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 */
+	/* private data, not stored in udevdb */
+	char devpath[DEVPATH_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
 	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, int fake);
-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 dev_d_execute(struct udevice *udev);
 
 extern char **main_argv;
 extern char **main_envp;
@@ -78,6 +89,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