export DEVNAME on "remove" only if we really got a node to remove

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 11fbe024606f24e9cafd4b2f56fe500208139f6d..66edfd66bffea97fbf7b339eebf2abb613c9b43f 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,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 
-#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
-
 #define LINE_SIZE                      512
 #define NAME_SIZE                      128
 #define PATH_SIZE                      256
@@ -40,6 +36,9 @@
 #define VALUE_SIZE                     128
 
 #define DEFAULT_PARTITIONS_COUNT       15
+#define UDEV_ALARM_TIMEOUT             120
+
+struct udev_rules;
 
 enum device_type {
        DEV_UNKNOWN,
@@ -56,7 +55,6 @@ struct udevice {
 
        enum device_type type;
        char name[PATH_SIZE];
-       int name_set;
        char devname[PATH_SIZE];
        struct list_head symlink_list;
        int symlink_final;
@@ -69,6 +67,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;
@@ -83,6 +82,9 @@ 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 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);