X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=d0b0477ff5389050713005d4d582de98d16e17e0;hp=5e50dcbdafc292f8c05a29f986f1d5510259938b;hb=16ebe978aeced862dd877cfee81ac7604902fd55;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/discover/parser.c b/discover/parser.c
index 5e50dcb..d0b0477 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,85 +1,41 @@
 
-#include <petitboot-paths.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "parser.h"
-
-extern struct parser native_parser;
-extern struct parser yaboot_parser;
-extern struct parser kboot_parser;
+#include "types/types.h"
+#include <log/log.h>
 
-/* array of parsers, ordered by priority */
-static struct parser *parsers[] = {
-	&native_parser,
-	&yaboot_parser,
-	&kboot_parser,
+#include "device-handler.h"
+#include "parser.h"
+#include "parser-utils.h"
+
+struct parser __grub2_parser;
+struct parser __kboot_parser;
+struct parser __native_parser;
+struct parser __yaboot_parser;
+
+static const struct parser *const parsers[] = {
+//	&__native_parser,
+	&__kboot_parser,
+	&__grub2_parser,
+	&__yaboot_parser,
 	NULL
 };
 
-void iterate_parsers(const char *devpath, const char *mountpoint)
+void iterate_parsers(struct discover_context *ctx)
 {
 	int i;
+	unsigned int count = 0;
 
-	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))
-			return;
+		count += parsers[i]->parse(ctx);
 	}
-	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);
+	if (!count)
+		pb_log("\tno boot_options found\n");
 }
 
-void free_boot_option(struct boot_option *opt)
+void parser_init(void)
 {
-	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");
-}
-