X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.h;h=56d585a8ba117f4e474c4ba1e134dab6c176ef45;hp=5dbc349fadb93aa541f6c684abd57bb9972fc7e7;hb=20be68872f056457b99cc64164171901be4bc5a3;hpb=e28232f4b8941ccd151abaaae3f18c32400436f3

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 5dbc349..56d585a 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -14,16 +14,6 @@ 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;
 
@@ -36,6 +26,7 @@ struct discover_device {
 	char			*mount_path;
 	const char		*device_path;
 	bool			mounted;
+	bool			mounted_rw;
 	bool			unmount;
 
 	bool			notified;
@@ -63,7 +54,6 @@ struct discover_context {
 	struct discover_device	*device;
 	struct list		boot_options;
 	struct pb_url		*conf_url;
-	enum conf_method	method;
 	void			*test_data;
 };
 
@@ -81,10 +71,11 @@ struct discover_device *discover_device_create(struct device_handler *handler,
 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);
+		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,
-		enum conf_method method);
+		struct discover_device *dev, struct pb_url *url);
 void device_handler_remove(struct device_handler *handler,
 		struct discover_device *device);
 
@@ -124,4 +115,7 @@ 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 */