discover: Separate temporary and permanent device data

[petitboot] / discover / device-handler.h

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 4cf7d7dadb5bd8256a7284a464a89fc51104fb64..809f88ee727ac1e16e9891c0714121fc802aa6d0 100644 (file)
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -4,21 +4,27 @@
 #include <list/list.h>
 
 struct device_handler;
+struct discover_device;
 struct discover_server;
+struct boot_option;
 struct boot_command;
 struct event;
 struct device;
 
+struct discover_device {
+       struct device           *device;
+
+       char                    **links;
+       int                     n_links;
+
+       char                    *mount_path;
+       char                    *device_path;
+};
+
 struct discover_context {
-       char *id;
-       char *device_path;
-       char *mount_path;
-       struct event *event;
-       struct device *device;
-       char **links;
-       int n_links;
-
-       struct list_item list;
+       struct event            *event;
+       struct discover_device  *device;
+       struct list             boot_options;
 };
 
 struct device_handler *device_handler_init(struct discover_server *server,
@@ -30,6 +36,10 @@ int device_handler_get_device_count(const struct device_handler *handler);
 const struct device *device_handler_get_device(
        const struct device_handler *handler, unsigned int index);
 
+struct device *discover_context_device(struct discover_context *ctx);
+void discover_context_add_boot_option(struct discover_context *ctx,
+               struct boot_option *opt);
+
 int device_handler_event(struct device_handler *handler, struct event *event);
 
 void device_handler_boot(struct device_handler *handler,