X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=3ca88e4e07d9adbd968f36c8d5867ca2d93ff9b9;hp=f785cccbe0d494cf9be69179d519cea5ab4df459;hb=d30872fe40c87300e62ef2aea484b9cea618c9de;hpb=86c9d34380b0074dab1ba89a569a94280d6999c4

diff --git a/discover/device-handler.h b/discover/device-handler.h
index f785ccc..3ca88e4 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -11,6 +11,7 @@ struct discover_device;
 struct discover_server;
 struct boot_option;
 struct boot_command;
+struct process_info;
 struct event;
 struct device;
 struct waitset;
@@ -37,6 +38,8 @@ struct discover_device {
 
 	struct list		boot_options;
 	struct list		params;
+
+	struct waiter		*requery_waiter;
 };
 
 struct discover_boot_option {
@@ -44,6 +47,7 @@ struct discover_boot_option {
 	struct discover_device	*device;
 	struct boot_option	*option;
 	struct list_item	list;
+	const char              *proxy;
 
 	struct resource		*boot_image;
 	struct resource		*initrd;
@@ -54,12 +58,12 @@ struct discover_boot_option {
 
 
 struct discover_context {
+	struct device_handler	*handler;
 	struct parser		*parser;
 	struct event		*event;
 	struct discover_device	*device;
 	struct list		boot_options;
 	struct pb_url		*conf_url;
-	struct network		*network;
 	void			*test_data;
 };
 
@@ -79,9 +83,14 @@ void device_handler_destroy(struct device_handler *devices);
 int device_handler_get_device_count(const struct device_handler *handler);
 const struct discover_device *device_handler_get_device(
 	const struct device_handler *handler, unsigned int index);
+int device_handler_get_plugin_count(const struct device_handler *handler);
+const struct plugin_option *device_handler_get_plugin(
+	const struct device_handler *handler, unsigned int index);
+struct network *device_handler_get_network(
+		const struct device_handler *handler);
 
 struct discover_device *discover_device_create(struct device_handler *handler,
-		const char *id);
+		const char *uuid, const char *id);
 void device_handler_add_device(struct device_handler *handler,
 		struct discover_device *device);
 void device_handler_add_ramdisk(struct device_handler *handler,
@@ -93,12 +102,26 @@ int device_handler_discover(struct device_handler *handler,
 		struct discover_device *dev);
 int device_handler_dhcp(struct device_handler *handler,
 		struct discover_device *dev, struct event *event);
-int device_handler_conf(struct device_handler *handler,
-		struct discover_device *dev, struct pb_url *url);
 void device_handler_remove(struct device_handler *handler,
 		struct discover_device *device);
-
-void device_handler_boot_status(void *arg, struct boot_status *status);
+void device_handler_start_requery_timeout( struct device_handler *handler,
+		struct discover_device *dev, int timeout);
+
+void device_handler_status(struct device_handler *handler,
+		struct status *status);
+void device_handler_status_info(struct device_handler *handler,
+		const char *fmt, ...);
+void device_handler_status_err(struct device_handler *handler,
+		const char *fmt, ...);
+void device_handler_status_dev_info(struct device_handler *handler,
+		struct discover_device *dev, const char *fmt, ...);
+void device_handler_status_dev_err(struct device_handler *handler,
+		struct discover_device *dev, const char *fmt, ...);
+void device_handler_status_download(struct device_handler *handler,
+		const struct process_info *procinfo,
+		unsigned int percentage, unsigned int size, char suffix);
+void device_handler_status_download_remove(struct device_handler *handler,
+		struct process_info *procinfo);
 
 struct discover_context *device_handler_discover_context_create(
 		struct device_handler *handler,
@@ -111,6 +134,8 @@ struct discover_boot_option *discover_boot_option_create(
 		struct discover_device *dev);
 void discover_context_add_boot_option(struct discover_context *ctx,
 		struct discover_boot_option *opt);
+void device_handler_add_plugin_option(struct device_handler *handler,
+		struct plugin_option *opt);
 
 int device_handler_user_event(struct device_handler *handler,
 				struct event *event);
@@ -139,7 +164,11 @@ void device_handler_update_config(struct device_handler *handler,
 		struct config *config);
 void device_handler_process_url(struct device_handler *handler,
 		const char *url, const char *mac, const char *ip);
+void device_handler_install_plugin(struct device_handler *handler,
+		const char *plugin_file);
 void device_handler_reinit(struct device_handler *handler);
+void device_handler_apply_temp_autoboot(struct device_handler *handler,
+		struct autoboot_option *opt);
 
 int device_request_write(struct discover_device *dev, bool *release);
 void device_release_write(struct discover_device *dev, bool release);