ui/common: Add discover_client_enumerate to re-add device data

[petitboot] / ui / common / discover-client.h

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index 6e768d9f9c50b463a296d6fab9a1d235f0a3faf6..d5c573f22de0bdfed18c8d7387514c52bc252b00 100644 (file)
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -2,12 +2,14 @@
 #define _DISCOVER_CLIENT_H
 
 #include <types/types.h>
+#include <waiter/waiter.h>
 
 struct discover_client;
 
 struct pb_boot_data {
        char *image;
        char *initrd;
+       char *dtb;
        char *args;
 };
 
@@ -16,30 +18,33 @@ struct pb_boot_data {
  * @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.
+ *
+ * The discover client holds talloc references to the devices (and the
+ * devices' boot options), so callbacks may store boot options and devices
+ * as long as the client remains allocated.
+ *
+ * The boot_status and system_info structs are allocated by the client,
+ * and will be free()ed after the callback is invoked. If the callback
+ * stores these structures for usage beyond the duration of the callback,
+ * it must talloc_steal() them.
  */
 
 struct discover_client_ops {
        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 (*update_sysinfo)(struct system_info *sysinfo, void *arg);
+       void (*update_config)(struct config *sysinfo, 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
@@ -66,4 +71,20 @@ 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);
+
+/* Tell the discover server to reinitialise */
+int discover_client_send_reinit(struct discover_client *client);
+
+/* Send new configuration data to the discover server */
+int discover_client_send_config(struct discover_client *client,
+               struct config *config);
+
+/* Re-enumerate the collected devices & boot options, calling ops->device_add
+ * and ops->boot_option_add on each.
+ */
+void discover_client_enumerate(struct discover_client *client);
 #endif