X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser-utils.h;h=9096b311ce6ecc00b4fd0d3f0c851fe8f588a4c5;hp=fe28b7bd74d7adfd100f011649fdbf27f17aca24;hb=0460a745e355158559c01b25f8138404f21b5d92;hpb=7c5e552c210b38a06ed9fbb99418b62e20978666

diff --git a/discover/parser-utils.h b/discover/parser-utils.h
index fe28b7b..9096b31 100644
--- a/discover/parser-utils.h
+++ b/discover/parser-utils.h
@@ -1,19 +1,24 @@
 #ifndef PARSER_UTILS_H
 #define PARSER_UTILS_H
 
-#include "pb-protocol/pb-protocol.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, __parse_fn)			\
-	struct parser 							\
-	__ ## __name ## _parser = {					\
-		.name		= #__name,				\
-		.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);