X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=693f5e45a229e66a71cd069049e10486c536cdd7;hp=ad9f50a43b041003048753591e22c176527b1594;hb=38d7d1a97d46aacf67675038c927e579bb589310;hpb=5e7c90eddd7ac2e4a3b05a7a5f6e29166edfa161

diff --git a/discover/device-handler.h b/discover/device-handler.h
index ad9f50a..693f5e4 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,10 +12,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 +46,7 @@ struct discover_boot_option {
 
 	struct resource		*boot_image;
 	struct resource		*initrd;
+	struct resource		*dtb;
 	struct resource		*icon;
 };
 
@@ -48,11 +56,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);
 
@@ -82,5 +91,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 */