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

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 1ac9f88..4949f3c 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -71,17 +71,10 @@ 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 discover_context		*ctx;
 	struct discover_boot_option	*opt;
@@ -92,9 +85,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);
 
@@ -145,18 +138,15 @@ 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);