X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=717c1218eb7b0adb540f9d3a82212dc1882bc0ff;hp=8b3f305d34effbe8d654a5094be98e00182a86ea;hb=3169e8d1ee24c7d23d7e535eb22fced869104ff8;hpb=4d803d8d04a8493f8efc039c7789c65be33048a0

diff --git a/udev.h b/udev.h
index 8b3f305d3..717c1218e 100644
--- a/udev.h
+++ b/udev.h
@@ -20,20 +20,26 @@
  *
  */
 
-#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 COMMENT_CHARACTER		'#'
 
-#define NAME_SIZE	100
-#define OWNER_SIZE	30
-#define GROUP_SIZE	30
-#define MODE_SIZE	8
-#define BOOL_SIZE	5	/* 'yes', 'no' and possibly 'true' or 'false'
-				   in future */
+#define NAME_SIZE			256
+#define OWNER_SIZE			30
+#define GROUP_SIZE			30
+#define MODE_SIZE			8
+
+#define ACTION_SIZE			32
+#define DEVPATH_SIZE			256
+#define SUBSYSTEM_SIZE			32
+#define SEQNUM_SIZE			32
+
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -42,26 +48,29 @@ struct udevice {
 	char type;
 	int major;
 	int minor;
-	mode_t mode;
+	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;
 
-	/* 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];
+	/* private data that help us in building strings */
+	char bus_id[SYSFS_NAME_LEN];
+	char program_result[NAME_SIZE];
+	char kernel_number[NAME_SIZE];
+	char kernel_name[NAME_SIZE];
 };
 
-#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(const char *path, const char *subsystem, int fake);
+extern int udev_remove_device(const char *path, const char *subsystem);
 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 char **main_argv;
 extern char **main_envp;
@@ -74,6 +83,8 @@ 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 char udev_log_str[BOOL_SIZE];
+extern int udev_log;
+extern int udev_sleep;
+extern int udev_dev_d;
 
 #endif