X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.h;h=6d5d1c483ac33b6c3bace0b3b457d4c6721cb6a6;hp=132da02c30a3187fe65234a2a8fc485593a06e90;hb=b838cf777ed3d21b166f8daddd4b11fc75e07307;hpb=2b42cdd35ccd83c52e9df257efdfcda040d170d9

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index 132da02..6d5d1c4 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -1,37 +1,59 @@
 #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 char *dev_id, void *arg);
+	int (*device_add)(struct device *device, void *arg);
+	void (*device_remove)(struct device *device, 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.
+ * Get the number of devices that the discover client has stored. This
+ * is the set of devices that have been added and not removed
  *
- * Will read from the client socket, and call add_device on any discovered
- * devices.
- * 
+ * @param client The discover client
+ * @return	 The number of devices that have been added.
  */
-int discover_client_process(struct discover_client *client);
+int discover_client_device_count(struct discover_client *client);
 
+/**
+ * Get the device at a specific index.
+ * @param client A pointer to the discover client
+ * @param index  The index of the device to retrieve
+ * @return	 The device at the specified index, or NULL if none exists
+ */
+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