X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=c2f9859c5a38141607f13e3cfc9cfb6c5669171f;hp=4acbb61391fbb3e58eb3a5b4f42266881c187707;hb=6a24dc747788b6049ef35607ff252e3965af2ce5;hpb=e8bacccab296d6b75c4c9f43cb4e71007aff5b8a

diff --git a/udev.h b/udev.h
index 4acbb6139..c2f9859c5 100644
--- a/udev.h
+++ b/udev.h
@@ -20,83 +20,74 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/libsysfs.h"
+#include <sys/types.h>
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.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
-
-/* Parser needs it's own debugging statement, we usually don't care about this at all */
-#ifdef DEBUG_PARSER
-#define dbg_parse(format, arg...)							\
-	do {										\
-		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
-	} while (0)
-#else
-	#define dbg_parse(format, arg...) do { } while (0)
-#endif
+#define ALARM_TIMEOUT			120
+#define COMMENT_CHARACTER		'#'
 
+#define NAME_SIZE			256
+#define USER_SIZE			32
 
-extern int log_message (int level, const char *format, ...)
-	__attribute__ ((format (printf, 2, 3)));
+#define ACTION_SIZE			32
+#define DEVPATH_SIZE			256
+#define SUBSYSTEM_SIZE			32
+#define SEQNUM_SIZE			32
 
+#define LINE_SIZE			512
 
-/* default filenames for the config and database files */
-#define UDEV_CONFIG_FILE		"udev.conf"
-#define UDEV_DB				".udev.tdb"
-#define UDEV_RULES_FILE			"udev.rules"
-#define UDEV_PERMISSION_FILE		"udev.permissions"
+#define DEVD_DIR			"/etc/dev.d"
+#define DEVD_SUFFIX			".dev"
 
-#define COMMENT_CHARACTER		'#'
+#define HOTPLUGD_DIR			"/etc/hotplug.d"
+#define HOTPLUG_SUFFIX			".hotplug"
 
-#define NAME_SIZE	100
-#define OWNER_SIZE	30
-#define GROUP_SIZE	30
+#define DEFAULT_PARTITIONS_COUNT	15
 
 struct udevice {
+	char devpath[DEVPATH_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
+
 	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
+	char symlink[NAME_SIZE];
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
+	mode_t mode;
 	char type;
 	int major;
 	int minor;
-	mode_t mode;
-
-	/* fields that help us in building strings */
-	unsigned char bus_id[SYSFS_NAME_LEN];
-	unsigned char callout_value[NAME_SIZE];
-	unsigned char kernel_number[NAME_SIZE];
 
+	char devname[NAME_SIZE];
+	char tmp_node[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;
 };
 
-#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 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 int udev_make_node(struct udevice *udev, const char *file, int major, int minor, mode_t mode, uid_t uid, gid_t gid);
 
-extern char **main_argv;
-extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
-extern char udev_config_dir[PATH_MAX];
 extern char udev_root[PATH_MAX];
-extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_permission_filename[PATH_MAX+NAME_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 int udev_log;
+extern int udev_dev_d;
+extern int udev_hotplug_d;
 
 #endif