lib/pb-config: Add autoboot timeout to configuration vars

[petitboot] / discover / device-handler.h

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 9a7cf6d07603435508b3b4b46a39818a219d9f94..0cd9c595fb535058e21da4a90fa4906de26fe7b8 100644 (file)
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -10,6 +10,16 @@ struct boot_option;
 struct boot_command;
 struct event;
 struct device;
+struct waitset;
+
+enum conf_method {
+       CONF_METHOD_LOCAL_FILE, /* discover by looking at local files on this
+                                  block device */
+
+       CONF_METHOD_DHCP,       /* configuration from a DHCP response */
+
+       CONF_METHOD_UNKNOWN = -1,
+};
 
 struct discover_device {
        struct device           *device;
@@ -22,26 +32,47 @@ struct discover_device {
 
        char                    *mount_path;
        char                    *device_path;
+
+       struct list             boot_options;
 };
 
+struct discover_boot_option {
+       struct parser           *source;
+       struct discover_device  *device;
+       struct boot_option      *option;
+       struct list_item        list;
+
+       struct resource         *boot_image;
+       struct resource         *initrd;
+       struct resource         *dtb;
+       struct resource         *icon;
+};
+
+
 struct discover_context {
+       struct parser           *parser;
        struct event            *event;
        struct discover_device  *device;
        struct list             boot_options;
+       struct pb_url           *conf_url;
+       enum conf_method        method;
 };
 
 struct device_handler *device_handler_init(struct discover_server *server,
-               int dry_run);
+               struct waitset *waitset, int dry_run);
 
 void device_handler_destroy(struct device_handler *devices);
 
 int device_handler_get_device_count(const struct device_handler *handler);
-const struct device *device_handler_get_device(
+const struct discover_device *device_handler_get_device(
        const struct device_handler *handler, unsigned int index);
 
 struct device *discover_context_device(struct discover_context *ctx);
+struct discover_boot_option *discover_boot_option_create(
+               struct discover_context *ctx,
+               struct discover_device *dev);
 void discover_context_add_boot_option(struct discover_context *ctx,
-               struct boot_option *opt);
+               struct discover_boot_option *opt);
 
 int device_handler_event(struct device_handler *handler, struct event *event);
 
@@ -58,5 +89,6 @@ struct discover_device *device_lookup_by_id(struct device_handler *handler,
 
 void device_handler_boot(struct device_handler *handler,
                struct boot_command *cmd);
+void device_handler_cancel_default(struct device_handler *handler);
 
 #endif /* _DEVICE_HANDLER_H */