X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fparser.c;h=c106dec0ae20c0a6210d317060cbe125f9656450;hb=7c5e552c210b38a06ed9fbb99418b62e20978666;hp=5b1a7abdab600656bc803721bef66f07bdcc9b88;hpb=ce5eab024583af5a4725503bad6ed2aee452b1aa;p=petitboot

diff --git a/discover/parser.c b/discover/parser.c
index 5b1a7ab..c106dec 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -2,29 +2,39 @@
 #include <stdlib.h>
 
 #include "pb-protocol/pb-protocol.h"
+#include <log/log.h>
 
 #include "device-handler.h"
-#include "log.h"
 #include "parser.h"
-extern struct parser kboot_parser;
+#include "parser-utils.h"
 
-/* array of parsers, ordered by priority */
-static struct parser *parsers[] = {
-	&kboot_parser,
+struct parser __native_parser;
+struct parser __yaboot_parser;
+struct parser __kboot_parser;
+struct parser __grub2_parser;
+
+static const struct parser *const parsers[] = {
+//	&__native_parser,
+	&__yaboot_parser,
+	&__kboot_parser,
 	NULL
 };
 
 void iterate_parsers(struct discover_context *ctx)
 {
 	int i;
+	unsigned int count = 0;
 
 	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(ctx))
-			return;
+		count += parsers[i]->parse(ctx);
 	}
-	pb_log("\tno boot_options found\n");
+	if (!count)
+		pb_log("\tno boot_options found\n");
+}
+
+void parser_init(void)
+{
 }