diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2009-01-02 16:34:18 +0900 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2009-01-02 16:34:18 +0900 |
commit | ce5eab024583af5a4725503bad6ed2aee452b1aa (patch) | |
tree | 534753bfa7fd65f6c173f62e75995adc6376ff9f /discover/parser.c | |
parent | b118597194815910897ccf86d77b8b5a066adf5a (diff) | |
download | talos-petitboot-ce5eab024583af5a4725503bad6ed2aee452b1aa.tar.gz talos-petitboot-ce5eab024583af5a4725503bad6ed2aee452b1aa.zip |
Hook up parsers to device discovery
Iterate the parsers from the device handler on an add event.
Initial change to just the kboot parser.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/parser.c')
-rw-r--r-- | discover/parser.c | 69 |
1 files changed, 7 insertions, 62 deletions
diff --git a/discover/parser.c b/discover/parser.c index 5e50dcb..5b1a7ab 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -1,85 +1,30 @@ -#include <petitboot-paths.h> #include <stdlib.h> -#include <string.h> -#include "parser.h" +#include "pb-protocol/pb-protocol.h" -extern struct parser native_parser; -extern struct parser yaboot_parser; +#include "device-handler.h" +#include "log.h" +#include "parser.h" extern struct parser kboot_parser; /* array of parsers, ordered by priority */ static struct parser *parsers[] = { - &native_parser, - &yaboot_parser, &kboot_parser, NULL }; -void iterate_parsers(const char *devpath, const char *mountpoint) +void iterate_parsers(struct discover_context *ctx) { int i; - pb_log("trying parsers for %s\n", devpath); + pb_log("trying parsers for %s\n", ctx->device_path); for (i = 0; parsers[i]; i++) { pb_log("\ttrying parser '%s'\n", parsers[i]->name); /* just use a dummy device path for now */ - if (parsers[i]->parse(devpath)) + if (parsers[i]->parse(ctx)) return; } pb_log("\tno boot_options found\n"); } - -/* convenience functions for parsers */ -void free_device(struct device *dev) -{ - if (!dev) - return; - if (dev->id) - free(dev->id); - if (dev->name) - free(dev->name); - if (dev->description) - free(dev->description); - if (dev->icon_file) - free(dev->icon_file); - free(dev); -} - -void free_boot_option(struct boot_option *opt) -{ - if (!opt) - return; - if (opt->name) - free(opt->name); - if (opt->description) - free(opt->description); - if (opt->icon_file) - free(opt->icon_file); - if (opt->boot_image_file) - free(opt->boot_image_file); - if (opt->initrd_file) - free(opt->initrd_file); - if (opt->boot_args) - free(opt->boot_args); - free(opt); -} - -const char *generic_icon_file(enum generic_icon_type type) -{ - switch (type) { - case ICON_TYPE_DISK: - return artwork_pathname("hdd.png"); - case ICON_TYPE_USB: - return artwork_pathname("usbpen.png"); - case ICON_TYPE_OPTICAL: - return artwork_pathname("cdrom.png"); - case ICON_TYPE_NETWORK: - case ICON_TYPE_UNKNOWN: - break; - } - return artwork_pathname("hdd.png"); -} - |