X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=d031b9699c99f6beac79fe897d3924a634a02518;hp=fb35cad49ac608fb02eef055ce4abdc3de1df967;hb=af4b05d4917fdfa55eff3d8d53a830464d8162a1;hpb=2232cac825e4f8b53273d16154309278cf639e3c

diff --git a/udev.h b/udev.h
index fb35cad49..d031b9699 100644
--- a/udev.h
+++ b/udev.h
@@ -20,37 +20,69 @@
  *
  */
 
-#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 OWNER_SIZE			32
+#define GROUP_SIZE			32
+#define MODE_SIZE			8
 
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT	"/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			256
 
-/* Binaries that udev calls to do stuff */
-#define MKNOD		"/bin/mknod"
+struct udevice {
+	char devpath[DEVPATH_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
+	char action[ACTION_SIZE];
+	char name[NAME_SIZE];
+	char owner[OWNER_SIZE];
+	char group[GROUP_SIZE];
+	char type;
+	int major;
+	int minor;
+	mode_t mode;
+	char symlink[NAME_SIZE];
+	int partitions;
+	int config_line;
+	char config_file[NAME_SIZE];
+	long config_uptime;
+	char bus_id[SYSFS_NAME_LEN];
+	char bus[SYSFS_NAME_LEN];
+	char program_result[NAME_SIZE];
+	char kernel_number[NAME_SIZE];
+	char kernel_name[NAME_SIZE];
+	char devname[NAME_SIZE];
+	int test_run;
+};
 
-extern int log_message (int level, const char *format, ...);
+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_execute(struct udevice *udev);
 
+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 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_dev_d;
 
 #endif
-