X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=391dc2c41c06860c55c625979c358cc6601a27ca;hp=d66e9f626e42307297c9ad1f0912e455ed46f69e;hb=613ffbeb15e0507581e5037850c1ea5d56cd0928;hpb=7e89a569cc4db0c1482662dc4df5f60df7aef3ff

diff --git a/udev.h b/udev.h
index d66e9f626..391dc2c41 100644
--- a/udev.h
+++ b/udev.h
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -23,74 +24,76 @@
 #ifndef _UDEV_H_
 #define _UDEV_H_
 
+#include <sys/types.h>
 #include <sys/param.h>
 #include "libsysfs/sysfs/libsysfs.h"
+#include "list.h"
 
-#define ALARM_TIMEOUT			30
-#define WAIT_FOR_FILE_SECONDS		10
-#define WAIT_FOR_FILE_RETRY_FREQ	10
 #define COMMENT_CHARACTER		'#'
-
-#define NAME_SIZE			256
-#define OWNER_SIZE			30
-#define GROUP_SIZE			30
-#define MODE_SIZE			8
-
-#define ACTION_SIZE			32
-#define DEVPATH_SIZE			256
-#define SUBSYSTEM_SIZE			32
+#define LINE_SIZE			512
+#define NAME_SIZE			128
+#define PATH_SIZE			256
+#define USER_SIZE			32
 #define SEQNUM_SIZE			32
+#define VALUE_SIZE			128
 
-#define LINE_SIZE			256
+#define DEFAULT_PARTITIONS_COUNT	15
+#define UDEV_ALARM_TIMEOUT		120
 
-#define FAKE				1
-#define NOFAKE				0
-
-/* length of public data to store in udevdb */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+enum device_type {
+	DEV_UNKNOWN,
+	DEV_CLASS,
+	DEV_BLOCK,
+	DEV_NET,
+	DEV_DEVICE,
+};
 
 struct udevice {
-	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];
+	char devpath[PATH_SIZE];
+	char subsystem[NAME_SIZE];
+	char action[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;
+	int mode_final;
+	dev_t devt;
+	struct list_head run_list;
+	int run_final;
+	struct list_head env_list;
+
+	char tmp_node[PATH_SIZE];
 	int partitions;
+	int ignore_device;
+	int ignore_remove;
 	int config_line;
-	char config_file[NAME_SIZE];
-	long config_uptime;
-
-	/* private data that help us in building strings */
-	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_add_device(const char *path, const char *subsystem, int fake);
-extern int udev_remove_device(const char *path, const 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 udev_start(void);
-extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_send(struct udevice *dev, const char *subsystem,
-	const char *devpath);
+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_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 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