discover/grub2: Function infrastructure improvements

[petitboot] / discover / grub2 / grub2.h

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 149e1e1fba0e6b6712ad61c98cc8eb5dcbee01aa..2de77a280b96ce97f2bbcefaa680ade0fc676221 100644 (file)
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -71,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 {
@@ -94,6 +89,10 @@ 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);
 
 struct grub2_statement *create_statement_simple(struct grub2_parser *parser,
@@ -135,18 +134,16 @@ 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);
 
@@ -159,7 +156,7 @@ 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 */