[PATCH] udev_volume_id: volume_id v35

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index fc44a9847c09f71e4a83e9401be9b9b9f0edbb77..d6dbd7c3325dcd00dbd47562fd22eeac52b47a3f 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -20,70 +20,82 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include <sysfs/libsysfs.h>
-#include <stddef.h>
+#include <sys/types.h>
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
+#include "list.h"
 
+#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
 
-#define NAME_SIZE      100
-#define OWNER_SIZE     30
-#define GROUP_SIZE     30
-#define MODE_SIZE      8
+#define NAME_SIZE                      256
+#define USER_SIZE                      32
 
-/* length of public data */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+#define ACTION_SIZE                    32
+#define DEVPATH_SIZE                   256
+#define SUBSYSTEM_SIZE                 32
+#define SEQNUM_SIZE                    32
+
+#define LINE_SIZE                      512
+
+#define DEVD_DIR                       "/etc/dev.d"
+#define DEVD_SUFFIX                    ".dev"
+
+#define HOTPLUGD_DIR                   "/etc/hotplug.d"
+#define HOTPLUG_SUFFIX                 ".hotplug"
+
+#define DEFAULT_PARTITIONS_COUNT       15
+
+enum device_type {
+       UNKNOWN,
+       CLASS,
+       BLOCK,
+       NET,
+       PHYSDEV,
+};
 
 struct udevice {
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
+
        char name[NAME_SIZE];
-       char owner[OWNER_SIZE];
-       char group[GROUP_SIZE];
-       char type;
-       int major;
-       int minor;
-       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
        char symlink[NAME_SIZE];
-       int partitions;
+       char owner[USER_SIZE];
+       char group[USER_SIZE];
+       mode_t mode;
+       char type;
+       dev_t devt;
 
-       /* private data that help us in building strings */
+       char devname[NAME_SIZE];
+       char tmp_node[NAME_SIZE];
+       int partitions;
+       int ignore_remove;
+       int config_line;
+       char config_file[NAME_SIZE];
        char bus_id[SYSFS_NAME_LEN];
        char program_result[NAME_SIZE];
        char kernel_number[NAME_SIZE];
        char kernel_name[NAME_SIZE];
+       int test_run;
 };
 
-#define strfieldcpy(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-#define strfieldcat(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncat(to, from, sizeof(to) - strlen(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(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 parse_get_pair(char **orig_string, char **left, char **right);
+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 **main_argv;
-extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
 extern char udev_root[PATH_MAX];
-extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_permissions_filename[PATH_MAX+NAME_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 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;
+extern int udev_hotplug_d;
 
 #endif