discover: Change parsers to emit resources rather than filenames

[petitboot] / discover / device-handler.h

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 9a7cf6d07603435508b3b4b46a39818a219d9f94..5dead2459d0217c08361a41c9f2ebc1fb43ac3ef 100644 (file)
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -22,8 +22,21 @@ struct discover_device {
 
        char                    *mount_path;
        char                    *device_path;
 
        char                    *mount_path;
        char                    *device_path;

+
+       struct list             boot_options;

 };
 
 };
 

+struct discover_boot_option {
+       struct discover_device  *device;
+       struct boot_option      *option;
+       struct list_item        list;
+
+       struct resource         *boot_image;
+       struct resource         *initrd;
+       struct resource         *icon;
+};
+
+

 struct discover_context {
        struct event            *event;
        struct discover_device  *device;
 struct discover_context {
        struct event            *event;
        struct discover_device  *device;


@@ -36,12 +49,15 @@ struct device_handler *device_handler_init(struct discover_server *server,
 void device_handler_destroy(struct device_handler *devices);
 
 int device_handler_get_device_count(const struct device_handler *handler);
 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);
        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,
 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);
 
 
 int device_handler_event(struct device_handler *handler, struct event *event);