[PATCH] Make udev/udevstart be one binary

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 00f1361016d8e743d4503d8c5f08a677f7bdbf66..310154f55d9ffc382cd0dcf3f08f7aa39af496f9 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -20,18 +20,25 @@
  *
  */
 
-#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 NAME_SIZE                      256
+#define OWNER_SIZE                     30
+#define GROUP_SIZE                     30
+#define MODE_SIZE                      8
+
+#define ACTION_SIZE                    30
+#define DEVPATH_SIZE                   255
+#define SUBSYSTEM_SIZE                 30
+
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
 struct udevice {
        char name[NAME_SIZE];
@@ -42,24 +49,27 @@ struct udevice {
        int minor;
        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, int fake);
-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;
@@ -73,5 +83,7 @@ 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