X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=9a7cf6d07603435508b3b4b46a39818a219d9f94;hb=397dc244bfdc2a57fc3e8fd191b0ef60c8a4b66b;hp=7207f8d94104e2b93b385cbef196ecf9320d539c;hpb=b8122dc9340e2f208220f0c88b4d71f91b78774f;p=petitboot

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 7207f8d..9a7cf6d 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -4,24 +4,34 @@
 #include <list/list.h>
 
 struct device_handler;
+struct discover_device;
 struct discover_server;
+struct boot_option;
 struct boot_command;
 struct event;
 struct device;
 
+struct discover_device {
+	struct device		*device;
+
+	char			**links;
+	int			n_links;
+
+	char			*uuid;
+	char			*label;
+
+	char			*mount_path;
+	char			*device_path;
+};
+
 struct discover_context {
-	char *id;
-	char *device_path;
-	char *mount_path;
-	struct event *event;
-	struct device *device;
-	char **links;
-	int n_links;
-
-	struct list_item list;
+	struct event		*event;
+	struct discover_device	*device;
+	struct list		boot_options;
 };
 
-struct device_handler *device_handler_init(struct discover_server *server);
+struct device_handler *device_handler_init(struct discover_server *server,
+		int dry_run);
 
 void device_handler_destroy(struct device_handler *devices);
 
@@ -29,8 +39,23 @@ int device_handler_get_device_count(const struct device_handler *handler);
 const struct device *device_handler_get_device(
 	const struct device_handler *handler, unsigned int index);
 
+struct device *discover_context_device(struct discover_context *ctx);
+void discover_context_add_boot_option(struct discover_context *ctx,
+		struct boot_option *opt);
+
 int device_handler_event(struct device_handler *handler, struct event *event);
 
+struct discover_device *device_lookup_by_name(struct device_handler *handler,
+		const char *name);
+struct discover_device *device_lookup_by_path(struct device_handler *handler,
+		const char *path);
+struct discover_device *device_lookup_by_uuid(struct device_handler *handler,
+		const char *uuid);
+struct discover_device *device_lookup_by_label(struct device_handler *handler,
+		const char *label);
+struct discover_device *device_lookup_by_id(struct device_handler *handler,
+		const char *id);
+
 void device_handler_boot(struct device_handler *handler,
 		struct boot_command *cmd);