[PATCH] switch major/minor to dev_t

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index cff991e57a040b34206833a83d88d8b3e6d30db3..2d2ef364b6084c47d26c2f967059c45b6a38f96e 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -23,6 +23,7 @@
 #ifndef _UDEV_H_
 #define _UDEV_H_
 
+#include <sys/types.h>
 #include <sys/param.h>
 #include "libsysfs/sysfs/libsysfs.h"
 
@@ -37,7 +38,7 @@
 #define SUBSYSTEM_SIZE                 32
 #define SEQNUM_SIZE                    32
 
-#define LINE_SIZE                      256
+#define LINE_SIZE                      512
 
 #define DEVD_DIR                       "/etc/dev.d"
 #define DEVD_SUFFIX                    ".dev"
@@ -45,6 +46,8 @@
 #define HOTPLUGD_DIR                   "/etc/hotplug.d"
 #define HOTPLUG_SUFFIX                 ".hotplug"
 
+#define DEFAULT_PARTITIONS_COUNT       15
+
 struct udevice {
        char devpath[DEVPATH_SIZE];
        char subsystem[SUBSYSTEM_SIZE];
@@ -55,15 +58,14 @@ struct udevice {
        char group[USER_SIZE];
        mode_t mode;
        char type;
-       int major;
-       int minor;
+       dev_t devt;
 
        char devname[NAME_SIZE];
+       char tmp_node[NAME_SIZE];
        int partitions;
        int ignore_remove;
        int config_line;
        char config_file[NAME_SIZE];
-       long config_uptime;
        char bus_id[SYSFS_NAME_LEN];
        char program_result[NAME_SIZE];
        char kernel_number[NAME_SIZE];
@@ -75,18 +77,14 @@ extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *clas
 extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
-extern int parse_get_pair(char **orig_string, char **left, char **right);
 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_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern mode_t default_mode;
-extern char default_owner[USER_SIZE];
-extern char default_group[USER_SIZE];
 extern int udev_log;
 extern int udev_dev_d;
 extern int udev_hotplug_d;