X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=f7a65c60d826cacf57d3da99f3fe9c6e80928286;hp=1cd07852b41eea82e4361443e0694faba7b714e8;hb=821d0ec803a72841f173739f5b713fe847edab75;hpb=961e47847cdb33b1fabe4084cef7cd37f73a19d1

diff --git a/udev.h b/udev.h
index 1cd07852b..f7a65c60d 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
@@ -20,64 +21,83 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/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 LINE_SIZE			512
+#define NAME_SIZE			128
+#define PATH_SIZE			256
+#define USER_SIZE			32
+#define SEQNUM_SIZE			32
+#define VALUE_SIZE			128
 
-/* length of public data */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+#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 {
+	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];
-	int partitions;
+	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;
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
+	mode_t mode;
+	dev_t devt;
+	struct list_head run_list;
 
-	/* private data that help us in building strings */
-	char bus_id[SYSFS_NAME_LEN];
-	char program_result[NAME_SIZE];
+	char tmp_node[PATH_SIZE];
+	int partitions;
+	int ignore_device;
+	int ignore_remove;
+	int config_line;
+	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;
 };
 
-#define strfieldcpy(to, from) \
-do { \
-	to[sizeof(to)-1] = '\0'; \
-	strncpy(to, from, sizeof(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_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 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;
+extern int udev_dev_d;
+extern int udev_hotplug_d;
 
 #endif