don't start udevd from udevsend

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 2c3377ad2e716fae1a923d3d6e254e70c18e3195..faa12a31eee1f130f18402e617b69b6ffa8a4ab7 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -1,8 +1,6 @@
 /*
  * udev.h
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
@@ -29,9 +27,8 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 
-#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
-
+#define PATH_TO_NAME_CHAR              '@'
 #define LINE_SIZE                      512
 #define NAME_SIZE                      128
 #define PATH_SIZE                      256
@@ -39,13 +36,12 @@
 #define SEQNUM_SIZE                    32
 #define VALUE_SIZE                     128
 
-#define DEVD_DIR                       "/etc/dev.d"
-#define DEVD_SUFFIX                    ".dev"
+#define DEFAULT_PARTITIONS_COUNT       15
+#define UDEV_ALARM_TIMEOUT             180
 
-#define HOTPLUGD_DIR                   "/etc/hotplug.d"
-#define HOTPLUG_SUFFIX                 ".hotplug"
+#define DB_DIR                         ".udev/db"
 
-#define DEFAULT_PARTITIONS_COUNT       15
+struct udev_rules;
 
 enum device_type {
        DEV_UNKNOWN,
@@ -74,6 +70,7 @@ struct udevice {
        dev_t devt;
        struct list_head run_list;
        int run_final;
+       struct list_head env_list;
 
        char tmp_node[PATH_SIZE];
        int partitions;
@@ -88,20 +85,27 @@ struct udevice {
        int test_run;
 };
 
+extern int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action);
+extern void udev_cleanup_device(struct udevice *udev);
+extern dev_t get_devt(struct sysfs_class_device *class_dev);
+extern int udev_process_event(struct udev_rules *rules, struct udevice *udev);
 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 void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 extern int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
 
+extern int udev_db_add_device(struct udevice *dev);
+extern int udev_db_delete_device(struct udevice *dev);
+extern int udev_db_get_device(struct udevice *udev, const char *devpath);
+extern int udev_db_lookup_name(const char *name, char *devpath, size_t len);
+extern int udev_db_get_all_entries(struct list_head *name_list);
+
 extern char sysfs_path[PATH_SIZE];
 extern char udev_root[PATH_SIZE];
-extern char udev_db_path[PATH_SIZE];
 extern char udev_config_filename[PATH_SIZE];
 extern char udev_rules_filename[PATH_SIZE];
 extern int udev_log_priority;
 extern int udev_run;
-extern int udev_hotplug_d;
 
 #endif