types: Remove detail and progress from struct status

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

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index feca63b9eac324c2fd77a6005eda2979c25cf3fc..95a5d9e691e91cf83870828c3038f59938c815e1 100644 (file)
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -11,6 +11,7 @@ struct pb_boot_data {
        char *initrd;
        char *dtb;
        char *args;
+       char *args_sig_file;
 };
 
 /**
@@ -18,6 +19,15 @@ 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 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 {
@@ -25,8 +35,9 @@ struct discover_client_ops {
        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_status)(struct status *status, void *arg);
        void (*update_sysinfo)(struct system_info *sysinfo, void *arg);
+       void (*update_config)(struct config *sysinfo, void *arg);
        void *cb_arg;
 };
 
@@ -65,4 +76,20 @@ int discover_client_boot(struct discover_client *client,
 /* 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);
+
+/* Send url to config to the discover server */
+int discover_client_send_url(struct discover_client *client, char *url);
+
 #endif