X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=90aa82393911bafece7d3d9d59ef9882e9214aff;hp=e9fc2e46eb86392e211d8f9f6ea986ae34f82ebf;hb=b2a21a35476b4780ef1fc68c60216117ab66fa2b;hpb=c27e69116d3ef0ea069a3c5146009ced08a0238b

diff --git a/udev.h b/udev.h
index e9fc2e46e..90aa82393 100644
--- a/udev.h
+++ b/udev.h
@@ -23,41 +23,50 @@
 #ifndef UDEV_H
 #define UDEV_H
 
+#include "libsysfs/libsysfs.h"
+#include <sys/param.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 */
-
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT	"/udev/"
-
-extern int log_message (int level, const char *format, ...)
-	__attribute__ ((format (printf, 2, 3)));
+#define COMMENT_CHARACTER		'#'
 
 #define NAME_SIZE	100
 #define OWNER_SIZE	30
 #define GROUP_SIZE	30
 
-struct device_attr {
+struct udevice {
 	char name[NAME_SIZE];
 	char owner[OWNER_SIZE];
 	char group[GROUP_SIZE];
-	int mode;
+	char type;
+	int major;
+	int minor;
+	mode_t mode;
+	char symlink[NAME_SIZE];
+
+	/* fields that help us in building strings */
+	unsigned char bus_id[SYSFS_NAME_LEN];
+	unsigned char program_result[NAME_SIZE];
+	unsigned char kernel_number[NAME_SIZE];
+	unsigned char kernel_name[NAME_SIZE];
 };
 
-extern int udev_add_device(char *device, char *subsystem);
-extern int udev_remove_device(char *device, char *subsystem);
+#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);
+extern int udev_remove_device(char *path, char *subsystem);
+extern void udev_init_config(void);
 
 extern char **main_argv;
 extern char **main_envp;
-#endif
+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[NAME_MAX];
 
+#endif