summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
54f9457)
Change the parser structure array implementation from using an
array in a seperate parsers section to a static array of pointers
in parser.c. Parser priority is now set by the position in the
new parsers array.
Signed-off-by: Geoff Levand <geoff@infradead.org>
-define_parser(kboot, 98, kboot_parse);
+define_parser(kboot, kboot_parse);
-define_parser(native, 100, native_parse);
+define_parser(native, native_parse);
#define artwork_pathname(file) (PKG_SHARE_DIR "/artwork/" file)
#define artwork_pathname(file) (PKG_SHARE_DIR "/artwork/" file)
-#define define_parser(__name, __priority, __parse_fn) \
+#define define_parser(__name, __parse_fn) \
- __attribute__((unused, section("parsers"))) \
__ ## __name ## _parser = { \
.name = #__name, \
__ ## __name ## _parser = { \
.name = #__name, \
- .priority = __priority, \
.parse = __parse_fn, \
};
.parse = __parse_fn, \
};
void device_add_boot_option(struct device *device,
struct boot_option *boot_option);
void device_add_boot_option(struct device *device,
struct boot_option *boot_option);
#include "parser.h"
#include "parser-utils.h"
#include "parser.h"
#include "parser-utils.h"
-extern struct parser __start_parsers[], __stop_parsers[];
+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)
{
void iterate_parsers(struct discover_context *ctx)
{
unsigned int count = 0;
pb_log("trying parsers for %s\n", ctx->device_path);
unsigned int count = 0;
pb_log("trying parsers for %s\n", ctx->device_path);
- for (parser = __start_parsers; parser < __stop_parsers; parser++) {
- pb_log("\ttrying parser '%s'\n", parser->name);
- count += parser->parse(ctx);
+ for (i = 0; parsers[i]; i++) {
+ pb_log("\ttrying parser '%s'\n", parsers[i]->name);
+ count += parsers[i]->parse(ctx);
}
if (!count)
pb_log("\tno boot_options found\n");
}
}
if (!count)
pb_log("\tno boot_options found\n");
}
-static int compare_parsers(const void *a, const void *b)
-{
- const struct parser *parser_a = a, *parser_b = b;
-
- if (parser_a->priority > parser_b->priority)
- return -1;
-
- if (parser_a->priority < parser_b->priority)
- return 1;
-
- return 0;
-}
-
- /* sort our parsers into descending priority order */
- qsort(__start_parsers, __stop_parsers - __start_parsers,
- sizeof(struct parser), compare_parsers);
-define_parser(yaboot, 99, yaboot_parse);
+define_parser(yaboot, yaboot_parse);