X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=246abf94657600e9916b196ec6ab1e4e1ee8d484;hp=0cd9c595fb535058e21da4a90fa4906de26fe7b8;hb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f;hpb=a60ef7083d77029e7bd6f0b948c560c239406dbf

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 0cd9c59..246abf9 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;
@@ -11,15 +13,7 @@ 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 config;
 
 struct discover_device {
 	struct device		*device;
@@ -27,13 +21,19 @@ struct discover_device {
 	char			**links;
 	int			n_links;
 
-	char			*uuid;
-	char			*label;
+	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 {
@@ -55,7 +55,7 @@ struct discover_context {
 	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,
@@ -67,28 +67,59 @@ 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 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);
+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);
+
+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 discover_boot_option *opt);
 
-int device_handler_event(struct device_handler *handler, struct event *event);
+int device_handler_user_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,
 		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);
+void device_handler_update_config(struct device_handler *handler,
+		struct config *config);
+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);
 
 #endif /* _DEVICE_HANDLER_H */