X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=4949f3c031a9027f4aa5e42c9c92626ff5258535;hp=9da5ceeed2a013ca171658d92a00d73998a042ca;hb=1513dd5d05f6408a64e19ea18cfaeb0cb8c5fb73;hpb=e492b596187d283cfbd65a098fe1b2d0dafa311e

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 9da5cee..4949f3c 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -1,6 +1,8 @@
 #ifndef GRUB2_H
 #define GRUB2_H
 
+#include <discover/device-handler.h>
+
 #include <stdbool.h>
 #include <list/list.h>
 
@@ -69,18 +71,13 @@ struct grub2_statement_block {
 	struct grub2_statements	*statements;
 };
 
-struct grub2_command {
-	const char		*name;
-	int			(*exec)(struct grub2_script *script,
-					int argc, char *argv[]);
-	struct list_item	list;
-};
 
 struct grub2_script {
-	struct grub2_statements	*statements;
-	struct list		environment;
-	struct list		commands;
-	struct list		symtab;
+	struct grub2_statements		*statements;
+	struct list			environment;
+	struct list			symtab;
+	struct discover_context		*ctx;
+	struct discover_boot_option	*opt;
 };
 
 struct grub2_parser {
@@ -88,6 +85,10 @@ struct grub2_parser {
 	struct grub2_script	*script;
 };
 
+/* type for builtin functions */
+typedef int (*grub2_function)(struct grub2_script *script, void *data,
+				int argc, char *argv[]);
+
 struct grub2_statements *create_statements(struct grub2_parser *parser);
 
 struct grub2_statement *create_statement_simple(struct grub2_parser *parser,
@@ -129,19 +130,29 @@ int statement_if_execute(struct grub2_script *script,
 int statement_menuentry_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
 
-struct grub2_script *create_script(void *ctx);
+struct grub2_script *create_script(struct grub2_parser *parser,
+		struct discover_context *ctx);
 
 const char *script_env_get(struct grub2_script *script, const char *name);
 
 void script_env_set(struct grub2_script *script,
 		const char *name, const char *value);
 
-void script_register_command(struct grub2_script *script,
-		struct grub2_command *command);
-
-struct grub2_command *script_lookup_command(struct grub2_script *script,
-		const char *name);
+void script_register_function(struct grub2_script *script,
+		const char *name, grub2_function fn, void *data);
 
 void register_builtins(struct grub2_script *script);
+
+/* resources */
+struct resource *create_grub2_resource(void *ctx,
+		struct discover_device *orig_device,
+		const char *root, const char *path);
+
+bool resolve_grub2_resource(struct device_handler *handler,
+		struct resource *res);
+
+/* external parser api */
+struct grub2_parser *grub2_parser_create(struct discover_context *ctx);
+void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len);
 #endif /* GRUB2_H */