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

diff --git a/udev.h b/udev.h
index 59c374365..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
@@ -20,51 +21,79 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
+#include <sys/types.h>
+#include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
+#include "list.h"
 
-#ifdef DEBUG
-#include <syslog.h>
-#define dbg(format, arg...)								\
-	do {										\
-		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
-	} while (0)
-#else
-	#define dbg(format, arg...) do { } while (0)
-#endif
-
-
-/* Lots of constants that should be in a config file sometime */
-
-/* Location of sysfs mount */
-#define SYSFS_ROOT	"/sys"
+#define COMMENT_CHARACTER		'#'
+#define LINE_SIZE			512
+#define NAME_SIZE			128
+#define PATH_SIZE			256
+#define USER_SIZE			32
+#define SEQNUM_SIZE			32
+#define VALUE_SIZE			128
 
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT	"/udev/"
+#define DEFAULT_PARTITIONS_COUNT	15
+#define UDEV_ALARM_TIMEOUT		120
 
-/* device file in sysfs that contains major/minor number, leading / needed */
-#define DEV_FILE	"/dev"
-
-/* Binaries that udev calls to do stuff */
-#define MKNOD		"/bin/mknod"
+enum device_type {
+	DEV_UNKNOWN,
+	DEV_CLASS,
+	DEV_BLOCK,
+	DEV_NET,
+	DEV_DEVICE,
+};
 
-extern int log_message (int level, const char *format, ...)
-	__attribute__ ((format (printf, 2, 3)));
+struct udevice {
+	char devpath[PATH_SIZE];
+	char subsystem[NAME_SIZE];
+	char action[NAME_SIZE];
 
-#define NAME_SIZE	100
-#define OWNER_SIZE	30
-#define GROUP_SIZE	30
+	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;
 
-struct device_attr {
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-	int mode;
+	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;
 };
 
-extern int udev_add_device(char *device, char *subsystem);
-extern int udev_remove_device(char *device, 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 udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
 
-#endif
+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