X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=6b36e075000ecd2bcad00e9edf912463e9221010;hp=809f88ee727ac1e16e9891c0714121fc802aa6d0;hb=9fbd73a208c9465b4bf9e2c80c7290b72e62ead1;hpb=92806cf6bc15f680f75879288df12ea9a87e4608

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 809f88e..6b36e07 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -1,6 +1,8 @@
 #ifndef _DEVICE_HANDLER_H
 #define _DEVICE_HANDLER_H
 
+#include <stdbool.h>
+
 #include <list/list.h>
 
 struct device_handler;
@@ -10,6 +12,17 @@ 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 {
 	struct device		*device;
@@ -17,32 +30,102 @@ struct discover_device {
 	char			**links;
 	int			n_links;
 
+	const char		*uuid;
+	const char		*label;
+
 	char			*mount_path;
-	char			*device_path;
+	const char		*device_path;
+	bool			mounted;
+	bool			mounted_rw;
+	bool			unmount;
+
+	bool			notified;
+
+	struct list		boot_options;
+	struct list		params;
 };
 
+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		*dtb;
+	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;
+	void			*test_data;
 };
 
 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);
 
 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_device *discover_device_create(struct device_handler *handler,
+		const char *id);
+void device_handler_add_device(struct device_handler *handler,
+		struct discover_device *device);
+int device_handler_discover(struct device_handler *handler,
+		struct discover_device *dev, enum conf_method method);
+int device_handler_conf(struct device_handler *handler,
+		struct discover_device *dev, struct pb_url *url,
+		enum conf_method method);
+void device_handler_remove(struct device_handler *handler,
+		struct discover_device *device);
+
+struct discover_context *device_handler_discover_context_create(
+		struct device_handler *handler,
+		struct discover_device *device);
+void device_handler_discover_context_commit(struct device_handler *handler,
+		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_user_event(struct device_handler *handler,
+				struct event *event);
 
-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_uuid(struct device_handler *handler,
+		const char *uuid);
+struct discover_device *device_lookup_by_label(struct device_handler *handler,
+		const char *label);
+struct discover_device *device_lookup_by_id(struct device_handler *handler,
+		const char *id);
+struct discover_device *device_lookup_by_serial(
+		struct device_handler *device_handler,
+		const char *serial);
+
+void discover_device_set_param(struct discover_device *device,
+		const char *name, const char *value);
+const char *discover_device_get_param(struct discover_device *device,
+		const char *name);
 
 void device_handler_boot(struct device_handler *handler,
 		struct boot_command *cmd);
+void device_handler_cancel_default(struct device_handler *handler);
+
+int device_request_write(struct discover_device *dev, bool *release);
+void device_release_write(struct discover_device *dev, bool release);
 
 #endif /* _DEVICE_HANDLER_H */