X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.h;h=83bb9c97ea1de7b6aaa8ab6c4ac096bd029614b2;hp=d2a8fc4c15001002ab38d6c1851bb4c1ca72a6cf;hb=e65870b0d7638ad9e848b87526a04e32bc96f756;hpb=47a9f94bb346817b6767d5dac578a43beee47c1f;ds=sidebyside

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index d2a8fc4..83bb9c9 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -1,10 +1,17 @@
 #ifndef _DISCOVER_CLIENT_H
 #define _DISCOVER_CLIENT_H
 
-#include <pb-protocol/pb-protocol.h>
+#include <types/types.h>
+#include <waiter/waiter.h>
 
 struct discover_client;
 
+struct pb_boot_data {
+	char *image;
+	char *initrd;
+	char *args;
+};
+
 /**
  * struct discover_client_ops - Application supplied client info.
  * @device_add: PB_PROTOCOL_ACTION_ADD event callback.
@@ -13,27 +20,19 @@ struct discover_client;
  */
 
 struct discover_client_ops {
-	int (*device_add)(const struct device *device, void *arg);
-	void (*device_remove)(const struct device *device, void *arg);
+	int (*device_add)(struct device *device, void *arg);
+	int (*boot_option_add)(struct device *dev, struct boot_option *option,
+			void *arg);
+	void (*device_remove)(struct device *device, void *arg);
+	void (*update_status)(struct boot_status *status, void *arg);
 	void *cb_arg;
 };
 
-struct discover_client *discover_client_init(
+struct discover_client *discover_client_init(struct waitset *waitset,
 	const struct discover_client_ops *ops, void *cb_arg);
 
-int discover_client_get_fd(const struct discover_client *client);
-
 void discover_client_destroy(struct discover_client *client);
 
-/**
- * Process data from the server.
- *
- * Will read from the client socket, and call device_add on any discovered
- * devices.
- * 
- */
-int discover_client_process(struct discover_client *client);
-
 /**
  * Get the number of devices that the discover client has stored. This
  * is the set of devices that have been added and not removed
@@ -51,4 +50,17 @@ int discover_client_device_count(struct discover_client *client);
  */
 struct device *discover_client_get_device(struct discover_client *client,
 		int index);
+
+/* Tell the discover server to boot an image
+ * @param client A pointer to the discover client
+ * @param boot_command The command to boot
+ */
+int discover_client_boot(struct discover_client *client,
+		const struct device *device,
+		const struct boot_option *boot_option,
+		const struct pb_boot_data *data);
+
+/* Tell the discover server to cancel the default boot option, if any
+ */
+int discover_client_cancel_default(struct discover_client *client);
 #endif