X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=e71212ceb69be512874d3c958eb42488a4a1aa95;hp=8a469e0fe4c5361a46b8c91127514887240afae5;hb=e52b37c27c267c882d82cd1e34412817b5a4dbce;hpb=1eaa67c4bd124bd9e786c64c95f4fb1f3570482b

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 8a469e0..e71212c 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -4,31 +4,89 @@
 #include <list/list.h>
 
 struct device_handler;
+struct discover_device;
 struct discover_server;
-struct udev_event;
+struct boot_option;
+struct boot_command;
+struct event;
 struct device;
+struct waitset;
+
+enum conf_method {
+	CONF_METHOD_LOCAL_FILE,	/* discover by looking at local files on this
+				   block device */
+
+	CONF_METHOD_DHCP,	/* configuration from a DHCP response */
+
+	CONF_METHOD_UNKNOWN = -1,
+};
+
+struct discover_device {
+	struct device		*device;
+
+	char			**links;
+	int			n_links;
+
+	char			*uuid;
+	char			*label;
+
+	char			*mount_path;
+	char			*device_path;
+
+	struct list		boot_options;
+};
+
+struct discover_boot_option {
+	struct parser		*source;
+	struct discover_device	*device;
+	struct boot_option	*option;
+	struct list_item	list;
+
+	struct resource		*boot_image;
+	struct resource		*initrd;
+	struct resource		*dtb;
+	struct resource		*icon;
+};
+
 
 struct discover_context {
-	char *id;
-	char *device_path;
-	char *mount_path;
-	struct udev_event *event;
-	struct device *device;
-	char **links;
-	int n_links;
-
-	struct list_item list;
+	struct parser		*parser;
+	struct event		*event;
+	struct discover_device	*device;
+	struct list		boot_options;
+	struct pb_url		*conf_url;
+	enum conf_method	method;
 };
 
-struct device_handler *device_handler_init(struct discover_server *server);
+struct device_handler *device_handler_init(struct discover_server *server,
+		struct waitset *waitset, int dry_run);
 
 void device_handler_destroy(struct device_handler *devices);
 
 int device_handler_get_device_count(const struct device_handler *handler);
-const struct device *device_handler_get_device(
+const struct discover_device *device_handler_get_device(
 	const struct device_handler *handler, unsigned int index);
 
-int device_handler_event(struct device_handler *handler,
-		struct udev_event *event);
+struct device *discover_context_device(struct discover_context *ctx);
+struct discover_boot_option *discover_boot_option_create(
+		struct discover_context *ctx,
+		struct discover_device *dev);
+void discover_context_add_boot_option(struct discover_context *ctx,
+		struct discover_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_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);
+void device_handler_cancel_default(struct device_handler *handler);
 
 #endif /* _DEVICE_HANDLER_H */