X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=80eafb0d46a25e7318b67f38fe0529c50ad789a6;hp=458d1d9c370256e520031c2925fa4f6ebb5c2563;hb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404;hpb=85511f02466297b7dca07c3fe5491230f3f06d14

diff --git a/udev.h b/udev.h
index 458d1d9c3..80eafb0d4 100644
--- a/udev.h
+++ b/udev.h
@@ -20,39 +20,72 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_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
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
+#include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
-/* Lots of constants that should be in a config file sometime */
+#define ALARM_TIMEOUT			120
+#define COMMENT_CHARACTER		'#'
 
-/* Location of sysfs mount */
-#define SYSFS_ROOT	"/sys"
+#define NAME_SIZE			256
+#define USER_SIZE			32
 
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT	"/home/greg/linux/udev/"
+#define ACTION_SIZE			32
+#define DEVPATH_SIZE			256
+#define SUBSYSTEM_SIZE			32
+#define SEQNUM_SIZE			32
 
-/* device file in sysfs that contains major/minor number, leading / needed */
-#define DEV_FILE	"/dev"
+#define LINE_SIZE			512
 
-/* Binaries that udev calls to do stuff */
-#define MKNOD		"/bin/mknod"
+#define DEVD_DIR			"/etc/dev.d"
+#define DEVD_SUFFIX			".dev"
 
+#define HOTPLUGD_DIR			"/etc/hotplug.d"
+#define HOTPLUG_SUFFIX			".hotplug"
 
+struct udevice {
+	char devpath[DEVPATH_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
 
-extern int log_message (int level, const char *format, ...);
+	char name[NAME_SIZE];
+	char symlink[NAME_SIZE];
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
+	mode_t mode;
+	char type;
+	int major;
+	int minor;
 
+	char devname[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;
+};
 
-#endif
+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 void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
+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_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;
+
+#endif