X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=e834f1e5b9008fa478fbbc7b062ddb0aed6488a1;hb=8a0dc204e902a47a5b251c6d4a29eddb8f4a634a;hp=6d7017ff511b07bdaee729e5368e505e3d2dbb58;hpb=5840bc63e2029d22682d8de77dc8fcc4da1b436c;p=elogind.git

diff --git a/udev.h b/udev.h
index 6d7017ff5..e834f1e5b 100644
--- a/udev.h
+++ b/udev.h
@@ -20,50 +20,37 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/libsysfs.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 OWNER_SIZE			32
+#define GROUP_SIZE			32
+#define MODE_SIZE			8
 
-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			256
 
-/* Lots of constants that should be in a config file sometime */
+#define DEVD_DIR			"/etc/dev.d"
+#define DEVD_SUFFIX			".dev"
 
-#define NAME_SIZE	100
-#define OWNER_SIZE	30
-#define GROUP_SIZE	30
-
-struct device_attr {
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-	mode_t mode;
-};
+#define HOTPLUGD_DIR			"/etc/hotplug.d"
+#define HOTPLUG_SUFFIX			".hotplug"
 
 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];
@@ -71,12 +58,38 @@ struct udevice {
 	int major;
 	int minor;
 	mode_t mode;
+	char symlink[NAME_SIZE];
+	int partitions;
+	int ignore_remove;
+	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 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 int parse_get_pair(char **orig_string, char **left, char **right);
+extern void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix);
 
-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_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