X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.h;h=2245a65141330883383af48f9e448fa4e4a0e256;hp=719f72ab15e6d99dd00b26aedd4223c50c8724a2;hb=658d9e98eec02f92e3cf263a1bb27beb3d395b2f;hpb=f5192075ca25e91ae72f12c89cab0c9c66eb6606;ds=sidebyside

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index 719f72a..2245a65 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -1,39 +1,38 @@
 #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.
- * @add_device: PB_PROTOCOL_ACTION_ADD event callback.
- * @remove_device: PB_PROTOCOL_ACTION_REMOVE event callback.
+ * @device_add: PB_PROTOCOL_ACTION_ADD event callback.
+ * @device_remove: PB_PROTOCOL_ACTION_REMOVE event callback.
  * @cb_arg: Client managed convenience variable passed to callbacks.
  */
 
 struct discover_client_ops {
-	int (*add_device)(const struct device *device, void *arg);
-	void (*remove_device)(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(
-	const struct discover_client_ops *ops);
-
-int discover_client_get_fd(const struct discover_client *client);
+struct discover_client *discover_client_init(struct waitset *waitset,
+	const struct discover_client_ops *ops, void *cb_arg);
 
 void discover_client_destroy(struct discover_client *client);
 
-/**
- * Process data from the server.
- *
- * Will read from the client socket, and call add_device 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,13 @@ 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);
 #endif