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

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 9a7cf6d..f4c911e 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -11,6 +11,15 @@ struct boot_command;
 struct event;
 struct device;
 
+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;
 
@@ -22,12 +31,29 @@ struct discover_device {
 
 	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,
@@ -36,12 +62,15 @@ struct device_handler *device_handler_init(struct discover_server *server,
 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);