X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser-utils.h;h=9096b311ce6ecc00b4fd0d3f0c851fe8f588a4c5;hp=955f5f4d7e6b7c730c3f4e7a2f8313dacd71afe1;hb=8fa3f3bd22e66329ac0dd65a82bf8eb554e2364d;hpb=89ccc8e6dc81bc1d613454b9944c2f3324d43e2a

diff --git a/discover/parser-utils.h b/discover/parser-utils.h
index 955f5f4..9096b31 100644
--- a/discover/parser-utils.h
+++ b/discover/parser-utils.h
@@ -1,21 +1,24 @@
 #ifndef PARSER_UTILS_H
 #define PARSER_UTILS_H
 
+#include "types/types.h"
 #include "parser.h"
 
 #define streq(a,b) (!strcasecmp((a),(b)))
 
 #define artwork_pathname(file) (PKG_SHARE_DIR "/artwork/" file)
 
-#define define_parser(__name, __priority, __parse_fn)			\
-	struct parser 							\
-		__attribute__((unused, section("parsers")))		\
-	__ ## __name ## _parser = {					\
-		.name		= #__name,				\
-		.priority	= __priority,				\
-		.parse		= __parse_fn,				\
-	};
+#define __parser_funcname(_n) __register_parser ## _ ## _n
+#define  _parser_funcname(_n) __parser_funcname(_n)
 
+#define register_parser(_parser)					\
+	static	__attribute__((constructor))				\
+		void _parser_funcname(__COUNTER__)(void)		\
+	{								\
+		__register_parser(&_parser);				\
+	}
+
+void __register_parser(struct parser *parser);
 
 void device_add_boot_option(struct device *device,
 		struct boot_option *boot_option);