X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=7182f002a203364a937c10ce6d984f943798ffce;hp=809f88ee727ac1e16e9891c0714121fc802aa6d0;hb=01f60e05ef83e3b91f7084ed95e6cc07412c8bb9;hpb=92806cf6bc15f680f75879288df12ea9a87e4608

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 809f88e..7182f00 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -3,6 +3,8 @@
 
 #include <list/list.h>
 
+#define DEFAULT_BOOT_TIMEOUT_SEC	10
+
 struct device_handler;
 struct discover_device;
 struct discover_server;
@@ -10,6 +12,16 @@ 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;
@@ -17,31 +29,65 @@ struct discover_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		*icon;
+};
+
+
 struct discover_context {
+	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,
-		int dry_run);
+		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);
 
 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 boot_option *opt);
+		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_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);