[PATCH] improve klibc fixup integration

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 310154f55d9ffc382cd0dcf3f08f7aa39af496f9..f7a13a634b77e75fff756248e0ca98df7579b0a2 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -26,6 +26,7 @@
 #include <sys/param.h>
 #include "libsysfs/sysfs/libsysfs.h"
 
+#define ALARM_TIMEOUT                  30
 #define COMMENT_CHARACTER              '#'
 
 #define NAME_SIZE                      256
@@ -33,12 +34,15 @@
 #define GROUP_SIZE                     30
 #define MODE_SIZE                      8
 
-#define ACTION_SIZE                    30
-#define DEVPATH_SIZE                   255
-#define SUBSYSTEM_SIZE                 30
+#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))
+#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];
@@ -54,22 +58,24 @@ struct udevice {
        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;
 };
 
-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 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 __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 void dev_d_execute(struct udevice *udev);
 
 extern char **main_argv;
 extern char **main_envp;
@@ -83,7 +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