X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=54269dfd31162437d38fbc44b3645c4c2c910f48;hp=f4f4f11f2d7c2af212563d0dab766389bfbc620b;hb=c81b35c08bbd7789883993ea280e0d3772cce440;hpb=f0952f66e634c9da1639662079e74e60da4027ef

diff --git a/udev.h b/udev.h
index f4f4f11f2..54269dfd3 100644
--- a/udev.h
+++ b/udev.h
@@ -20,39 +20,61 @@
  *
  */
 
-#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_
 
-/* Lots of constants that should be in a config file sometime */
+#include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
-/* Location of sysfs mount */
-#define SYSFS_ROOT	"/sys"
+#define COMMENT_CHARACTER		'#'
 
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT	"/udev/"
+#define NAME_SIZE			100
+#define OWNER_SIZE			30
+#define GROUP_SIZE			30
+#define MODE_SIZE			8
 
-/* device file in sysfs that contains major/minor number, leading / needed */
-#define DEV_FILE	"/dev"
+#define ACTION_SIZE			30
+#define DEVPATH_SIZE			255
+#define SUBSYSTEM_SIZE			30
 
-/* Binaries that udev calls to do stuff */
-#define MKNOD		"/bin/mknod"
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
+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;
 
+	/* private data that help us in building strings */
+	char bus_id[SYSFS_NAME_LEN];
+	char program_result[NAME_SIZE];
+	char kernel_number[NAME_SIZE];
+	char kernel_name[NAME_SIZE];
+};
 
-extern int log_message (int level, const char *format, ...);
+extern int udev_add_device(char *path, char *subsystem, int fake);
+extern int udev_remove_device(char *path, char *subsystem);
+extern void udev_init_config(void);
+extern int parse_get_pair(char **orig_string, char **left, char **right);
 
+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;
 
 #endif
-