log to console if syslog is not available

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 811439faf2a5ee37e6e9f3debd2cbe6a6509f550..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,73 +27,76 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 
-#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
-
 #define LINE_SIZE                      512
-#define NAME_SIZE                      256
+#define NAME_SIZE                      128
+#define PATH_SIZE                      256
 #define USER_SIZE                      32
-
-#define ACTION_SIZE                    32
-#define DEVPATH_SIZE                   256
-#define SUBSYSTEM_SIZE                 32
 #define SEQNUM_SIZE                    32
-
-#define DEVD_DIR                       "/etc/dev.d"
-#define DEVD_SUFFIX                    ".dev"
-
-#define HOTPLUGD_DIR                   "/etc/hotplug.d"
-#define HOTPLUG_SUFFIX                 ".hotplug"
+#define VALUE_SIZE                     128
 
 #define DEFAULT_PARTITIONS_COUNT       15
+#define UDEV_ALARM_TIMEOUT             120
+
+struct udev_rules;
 
 enum device_type {
-       UNKNOWN,
-       CLASS,
-       BLOCK,
-       NET,
-       PHYSDEV,
+       DEV_UNKNOWN,
+       DEV_CLASS,
+       DEV_BLOCK,
+       DEV_NET,
+       DEV_DEVICE,
 };
 
 struct udevice {
-       char devpath[DEVPATH_SIZE];
-       char subsystem[SUBSYSTEM_SIZE];
+       char devpath[PATH_SIZE];
+       char subsystem[NAME_SIZE];
+       char action[NAME_SIZE];
 
-       char name[NAME_SIZE];
-       char devname[NAME_SIZE];
+       enum device_type type;
+       char name[PATH_SIZE];
+       char devname[PATH_SIZE];
        struct list_head symlink_list;
+       int symlink_final;
        char owner[USER_SIZE];
+       int owner_final;
        char group[USER_SIZE];
+       int group_final;
        mode_t mode;
-       char type;
+       int mode_final;
        dev_t devt;
+       struct list_head run_list;
+       int run_final;
+       struct list_head env_list;
 
-       char tmp_node[NAME_SIZE];
+       char tmp_node[PATH_SIZE];
        int partitions;
+       int ignore_device;
        int ignore_remove;
        int config_line;
-       char config_file[NAME_SIZE];
-       char bus_id[SYSFS_NAME_LEN];
-       char program_result[NAME_SIZE];
+       char config_file[PATH_SIZE];
+       char bus_id[NAME_SIZE];
+       char program_result[PATH_SIZE];
        char kernel_number[NAME_SIZE];
        char kernel_name[NAME_SIZE];
        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);
 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 char sysfs_path[SYSFS_PATH_MAX];
-extern char udev_root[PATH_MAX];
-extern char udev_db_path[PATH_MAX+NAME_MAX];
-extern char udev_config_filename[PATH_MAX+NAME_MAX];
-extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern int udev_log;
-extern int udev_dev_d;
-extern int udev_hotplug_d;
+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;
 
 #endif