X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.h;h=b738577ff3d9d4a17a41bdecb3a5247774d51ad9;hp=9c6fb352e84337b14ce647e538e7f23bb07bd6f2;hb=5e7c90eddd7ac2e4a3b05a7a5f6e29166edfa161;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/discover/parser.h b/discover/parser.h
index 9c6fb35..b738577 100644
--- a/discover/parser.h
+++ b/discover/parser.h
@@ -1,15 +1,39 @@
-
-#ifndef _PARSERS_H
-#define _PARSERS_H
-
-#include <stdarg.h>
-#include "message.h"
-
+#ifndef _PARSER_H
+#define _PARSER_H
+
+#include <stdbool.h>
+
+#include "device-handler.h"
+
+struct discover_context;
+struct device_handler;
+struct resource;
+
+/**
+ * Our config parser.
+ *
+ * Each parser is responsible for creating discover_boot_options from config
+ * files found on new devices. The boot items discovered during parse will have
+ * 'resources' attached (see @discover_boot_option), which may already be
+ * resolved (in the case of a device-local filename, or a URL), or unresolved
+ * (in the case of a filename on another device).
+ *
+ * If the boot option contains references to unresolved resources, the
+ * device handler will not inform clients about the boot options, as
+ * they're not properly "available" at this stage. The handler will attempt to
+ * resolve them whenever new devices are discovered, by calling the parser's
+ * resolve_resource function. Once a boot option's resources are full resolved,
+ * the option can be sent to clients.
+ */
 struct parser {
-	char *name;
-	int priority;
-	int (*parse)(const char *device);
-	struct parser *next;
+	char			*name;
+	enum conf_method	method;
+	const char * const	*filenames;
+	int			(*parse)(struct discover_context *ctx,
+						char *buf, int len);
+	bool			(*resolve_resource)(
+						struct device_handler *handler,
+						struct resource *res);
 };
 
 enum generic_icon_type {
@@ -22,25 +46,9 @@ enum generic_icon_type {
 
 #define streq(a,b) (!strcasecmp((a),(b)))
 
-/* general functions provided by parsers.c */
-void iterate_parsers(const char *devpath, const char *mountpoint);
-
-void free_device(struct device *dev);
-void free_boot_option(struct boot_option *opt);
-
-const char *generic_icon_file(enum generic_icon_type type);
-
-/* functions provided by udev-helper or the test wrapper */
-void pb_log(const char *fmt, ...);
-
-int mount_device(const char *dev_path);
-
-char *resolve_path(const char *path, const char *current_dev);
-const char *mountpoint_for_device(const char *dev_path);
-
-enum generic_icon_type guess_device_type(void);
+void parser_init(void);
 
-int add_device(const struct device *dev);
-int add_boot_option(const struct boot_option *opt);
+void iterate_parsers(struct discover_context *ctx, enum conf_method method);
+int parse_user_event(struct discover_context *ctx, struct event *event);
 
-#endif /* _PARSERS_H */
+#endif /* _PARSER_H */