X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev.h;h=56b1652c747cee9d3e0a3cbbe41bd79fbfdb318b;hp=3327031e879ea4a7fbbbc2de4c4dd21f216d7f77;hb=220893b3cbdbf8932f95c44811b169a8f0d33939;hpb=57f4ef67aa4e517e4ee1b79360169f5544f72379

diff --git a/udev/udev.h b/udev/udev.h
index 3327031e8..56b1652c7 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -32,7 +32,6 @@ struct udev_event {
 	struct udev_device *dev_parent;
 	struct udev_device *dev_db;
 	char *name;
-	char *tmp_node;
 	char *program_result;
 	mode_t mode;
 	uid_t uid;
@@ -51,7 +50,6 @@ struct udev_event {
 	bool owner_final;
 	bool mode_set;
 	bool mode_final;
-	bool static_node;
 	bool name_final;
 	bool devlink_final;
 	bool run_final;
@@ -91,7 +89,6 @@ void udev_watch_end(struct udev *udev, struct udev_device *dev);
 struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
 
 /* udev-node.c */
-int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_remove(struct udev_device *dev);
 void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
@@ -131,21 +128,6 @@ int udev_ctrl_get_exit(struct udev_ctrl_msg *ctrl_msg);
 const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg);
 
-/* udevadm commands */
-struct udevadm_cmd {
-	const char *name;
-	int (*cmd)(struct udev *udev, int argc, char *argv[]);
-	const char *help;
-	int debug;
-};
-extern const struct udevadm_cmd udevadm_monitor;
-extern const struct udevadm_cmd udevadm_info;
-extern const struct udevadm_cmd udevadm_control;
-extern const struct udevadm_cmd udevadm_trigger;
-extern const struct udevadm_cmd udevadm_settle;
-extern const struct udevadm_cmd udevadm_test;
-extern const struct udevadm_cmd udevadm_test_builtin;
-
 /* built-in commands */
 enum udev_builtin_cmd {
 	UDEV_BUILTIN_BLKID,
@@ -153,6 +135,8 @@ enum udev_builtin_cmd {
 	UDEV_BUILTIN_INPUT_ID,
 	UDEV_BUILTIN_KMOD,
 	UDEV_BUILTIN_PATH_ID,
+	UDEV_BUILTIN_PCI_DB,
+	UDEV_BUILTIN_USB_DB,
 	UDEV_BUILTIN_USB_ID,
 	UDEV_BUILTIN_MAX
 };
@@ -161,7 +145,8 @@ struct udev_builtin {
 	int (*cmd)(struct udev_device *dev, int argc, char *argv[], bool test);
 	const char *help;
 	int (*init)(struct udev *udev);
-	int (*exit)(struct udev *udev);
+	void (*exit)(struct udev *udev);
+	bool (*validate)(struct udev *udev);
 	bool run_once;
 };
 extern const struct udev_builtin udev_builtin_blkid;
@@ -169,13 +154,35 @@ extern const struct udev_builtin udev_builtin_firmware;
 extern const struct udev_builtin udev_builtin_input_id;
 extern const struct udev_builtin udev_builtin_kmod;
 extern const struct udev_builtin udev_builtin_path_id;
+extern const struct udev_builtin udev_builtin_pci_db;
+extern const struct udev_builtin udev_builtin_usb_db;
 extern const struct udev_builtin udev_builtin_usb_id;
-int udev_builtin_load(struct udev *udev);
-int udev_builtin_unload(struct udev *udev);
+int udev_builtin_init(struct udev *udev);
+void udev_builtin_exit(struct udev *udev);
 enum udev_builtin_cmd udev_builtin_lookup(const char *command);
 const char *udev_builtin_name(enum udev_builtin_cmd cmd);
 bool udev_builtin_run_once(enum udev_builtin_cmd cmd);
 int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test);
-int udev_builtin_list(struct udev *udev);
+void udev_builtin_list(struct udev *udev);
 int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);
+
+/* udev logging */
+void udev_main_log(struct udev *udev, int priority,
+		   const char *file, int line, const char *fn,
+		   const char *format, va_list args);
+
+/* udevadm commands */
+struct udevadm_cmd {
+	const char *name;
+	int (*cmd)(struct udev *udev, int argc, char *argv[]);
+	const char *help;
+	int debug;
+};
+extern const struct udevadm_cmd udevadm_info;
+extern const struct udevadm_cmd udevadm_trigger;
+extern const struct udevadm_cmd udevadm_settle;
+extern const struct udevadm_cmd udevadm_control;
+extern const struct udevadm_cmd udevadm_monitor;
+extern const struct udevadm_cmd udevadm_test;
+extern const struct udevadm_cmd udevadm_test_builtin;
 #endif