discover: fix return value for discover_device_get_param

[petitboot] / discover / parser.h

diff --git a/discover/parser.h b/discover/parser.h
index 589c6ff20de188409e5d04daedd81507fa76f469..e0e8dc67c9a948d21723e9eec954a9b669de8418 100644 (file)
--- a/discover/parser.h
+++ b/discover/parser.h
@@ -1,11 +1,36 @@
 #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 (*parse)(struct discover_context *ctx);
+       char                    *name;
+       int                     (*parse)(struct discover_context *ctx);
+       bool                    (*resolve_resource)(
+                                               struct device_handler *handler,
+                                               struct resource *res);
 };
 
 enum generic_icon_type {
@@ -21,6 +46,23 @@ enum generic_icon_type {
 void parser_init(void);
 
 void iterate_parsers(struct discover_context *ctx);
-int parse_user_event(struct device *device, struct event *event);
+int parse_user_event(struct discover_context *ctx, struct event *event);
+
+/* File IO functions for parsers; these should be the only interface that
+ * parsers use to access a device's filesystem.
+ *
+ * These are intended for small amounts of data, typically text configuration
+ * and state files.
+ */
+int parser_request_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char **buf, int *len);
+int parser_replace_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char *buf, int len);
+int parser_request_url(struct discover_context *ctx, struct pb_url *url,
+               char **buf, int *len);
+int parser_check_dir(struct discover_context *ctx,
+               struct discover_device *dev, const char *dirname);
 
 #endif /* _PARSER_H */