X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=874133db16032adc28f7af27872f9b576f19d12c;hp=58777339d61bb33df2eae5afd7915a093dcab15c;hb=1c3cb3b066bae9a981732d6ab868cee6df2136b4;hpb=d2f71341c8077c649c00f75c1f6c3f590c1b2576

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 5877733..874133d 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 
 #include <list/list.h>
+#include <types/types.h>
 
 struct device_handler;
 struct discover_device;
@@ -25,6 +26,7 @@ struct discover_device {
 	const char		*label;
 
 	char			*mount_path;
+	char			*root_path;
 	const char		*device_path;
 	struct ramdisk_device	*ramdisk;
 	bool			mounted;
@@ -46,17 +48,18 @@ struct discover_boot_option {
 	struct resource		*boot_image;
 	struct resource		*initrd;
 	struct resource		*dtb;
+	struct resource		*args_sig_file;
 	struct resource		*icon;
 };
 
 
 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;
 };
 
@@ -65,7 +68,7 @@ struct ramdisk_device {
 	char		*snapshot;
 	char		*origin;
 	char		*base;
-	unsigned int	sectors;
+	uint64_t	sectors;
 };
 
 struct device_handler *device_handler_init(struct discover_server *server,
@@ -76,9 +79,11 @@ 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);
+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,
@@ -90,11 +95,20 @@ 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_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, ...);
+
 struct discover_context *device_handler_discover_context_create(
 		struct device_handler *handler,
 		struct discover_device *device);
@@ -133,10 +147,11 @@ void device_handler_cancel_default(struct device_handler *handler);
 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 *url, const char *mac, const char *ip);
 void device_handler_reinit(struct device_handler *handler);
 
 int device_request_write(struct discover_device *dev, bool *release);
 void device_release_write(struct discover_device *dev, bool release);
+void device_sync_snapshots(struct device_handler *handler, const char *device);
 
 #endif /* _DEVICE_HANDLER_H */