X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=1515d690a528ed1931ec1d07692748da09b8bb38;hb=658244e405261ce92239b4002efcd2cd56d91470;hp=7f4a8345e666ff7ac78012320610ed07fdfe9c76;hpb=9638c29114c8d575d1b89c26dcf1f274ea6ab6c4;p=petitboot

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 7f4a834..1515d69 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -68,7 +68,7 @@ struct grub2_statement_conditional {
 
 struct grub2_statement_if {
 	struct grub2_statement	st;
-	struct grub2_statement	*conditional;
+	struct grub2_statements	*conditionals;
 	struct grub2_statements	*else_case;
 };
 
@@ -89,6 +89,7 @@ struct grub2_script {
 	struct list			symtab;
 	struct discover_context		*ctx;
 	struct discover_boot_option	*opt;
+	unsigned int			n_options;
 };
 
 struct grub2_parser {
@@ -114,6 +115,7 @@ struct grub2_statement *create_statement_conditional(
 
 struct grub2_statement *create_statement_if(struct grub2_parser *parser,
 		struct grub2_statement *conditional,
+		struct grub2_statements *elifs,
 		struct grub2_statements *else_case);
 
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
@@ -142,6 +144,8 @@ void script_execute(struct grub2_script *script);
 
 int statement_simple_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
+int statement_block_execute(struct grub2_script *script,
+		struct grub2_statement *statement);
 int statement_if_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
 int statement_menuentry_execute(struct grub2_script *script,
@@ -163,7 +167,7 @@ void script_register_function(struct grub2_script *script,
 void register_builtins(struct grub2_script *script);
 
 /* resources */
-struct resource *create_grub2_resource(void *ctx,
+struct resource *create_grub2_resource(struct discover_boot_option *opt,
 		struct discover_device *orig_device,
 		const char *root, const char *path);