discover: Consolidate device path, name and ID.

[petitboot] / discover / device-handler.h

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 3c4574b1403d367381f3ff76b391697a11ef27c7..e71212ceb69be512874d3c958eb42488a4a1aa95 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;
@@ -27,20 +37,29 @@ struct discover_device {
 };
 
 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);
 
@@ -59,8 +78,6 @@ int device_handler_event(struct device_handler *handler, struct event *event);
 
 struct discover_device *device_lookup_by_name(struct device_handler *handler,
                const char *name);
-struct discover_device *device_lookup_by_path(struct device_handler *handler,
-               const char *path);
 struct discover_device *device_lookup_by_uuid(struct device_handler *handler,
                const char *uuid);
 struct discover_device *device_lookup_by_label(struct device_handler *handler,
@@ -70,5 +87,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 */