X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=5b83fad5d05f38503fd755207de96b8955d800cd;hp=149e1e1fba0e6b6712ad61c98cc8eb5dcbee01aa;hb=e8a50ad2461a8efaa4d71ea19692a1b63a0f9bc2;hpb=2ea5eb23b027519372dd20fbe8f958c06ac2aa6c

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 149e1e1..5b83fad 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -71,18 +71,18 @@ 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_statement_function {
+	struct grub2_statement	st;
+	struct grub2_word	*name;
+	struct grub2_statements	*body;
 };
 
 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 {
@@ -90,9 +90,9 @@ struct grub2_parser {
 	struct grub2_script	*script;
 };
 
-struct grub2_root {
-	char *uuid;
-};
+/* 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);
 
@@ -110,6 +110,9 @@ struct grub2_statement *create_statement_if(struct grub2_parser *parser,
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 		struct grub2_statements *stmts);
 
+struct grub2_statement *create_statement_function(struct grub2_parser *parser,
+		struct grub2_word *name, struct grub2_statements *body);
+
 struct grub2_word *create_word_text(struct grub2_parser *parser,
 		const char *text);
 
@@ -134,32 +137,32 @@ int statement_if_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
 int statement_menuentry_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
+int statement_function_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,
-		struct grub2_root *root, const char *path);
+		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(void *ctx);
+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 */