X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=e71212ceb69be512874d3c958eb42488a4a1aa95;hp=ad9f50a43b041003048753591e22c176527b1594;hb=e52b37c27c267c882d82cd1e34412817b5a4dbce;hpb=5e7c90eddd7ac2e4a3b05a7a5f6e29166edfa161

diff --git a/discover/device-handler.h b/discover/device-handler.h
index ad9f50a..e71212c 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -10,10 +10,15 @@ 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 {
@@ -39,6 +44,7 @@ struct discover_boot_option {
 
 	struct resource		*boot_image;
 	struct resource		*initrd;
+	struct resource		*dtb;
 	struct resource		*icon;
 };
 
@@ -48,11 +54,12 @@ struct discover_context {
 	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);
 
@@ -71,8 +78,6 @@ 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,
@@ -82,5 +87,6 @@ struct discover_device *device_lookup_by_id(struct device_handler *handler,
 
 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 */