X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=b5088b90c69e136d84e6ecd23dc165829e211e5c;hb=e41245cb256231ef6954b3cbf45f0635d01501ed;hp=108623e0597eca6515689bc60c0ef1ce47e987ac;hpb=51a8bb2f361d86013e7579570faba446eed9c66d;p=elogind.git

diff --git a/udev.h b/udev.h
index 108623e05..b5088b90c 100644
--- a/udev.h
+++ b/udev.h
@@ -23,7 +23,8 @@
 #ifndef UDEV_H
 #define UDEV_H
 
-#include "libsysfs/libsysfs.h"
+#include <sysfs/libsysfs.h>
+#include <stddef.h>
 #include <sys/param.h>
 
 #define COMMENT_CHARACTER		'#'
@@ -33,6 +34,9 @@
 #define GROUP_SIZE	30
 #define MODE_SIZE	8
 
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+
 struct udevice {
 	char name[NAME_SIZE];
 	char owner[OWNER_SIZE];
@@ -40,14 +44,15 @@ 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;
 
-	/* 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) \
@@ -56,7 +61,7 @@ do { \
 	strncpy(to, from, sizeof(to)-1); \
 } while (0)
 
-extern int udev_add_device(char *path, char *subsystem);
+extern int udev_add_device(char *path, char *subsystem, int fake);
 extern int udev_remove_device(char *path, char *subsystem);
 extern void udev_init_config(void);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
@@ -73,5 +78,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;
 
 #endif