From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>,
Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>
Subject: [PATCH v2 04/18] pxe: Move do_getfile() into the context
Date: Mon, 27 Sep 2021 09:23:46 -0600 [thread overview]
Message-ID: <20210927152400.433569-5-sjg@chromium.org> (raw)
In-Reply-To: <20210927152400.433569-1-sjg@chromium.org>
Rather than having a global variable, pass the function as part of the
context.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
cmd/pxe.c | 10 ++++------
cmd/pxe_utils.c | 9 ++++-----
cmd/pxe_utils.h | 20 +++++++++++++++++---
cmd/sysboot.c | 20 ++++++++++----------
4 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 17ce54fc049..70dbde3a636 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -24,7 +24,7 @@ const char *pxe_default_paths[] = {
NULL
};
-static int do_get_tftp(struct cmd_tbl *cmdtp, const char *file_path,
+static int do_get_tftp(struct pxe_context *ctx, const char *file_path,
char *file_addr)
{
char *tftp_argv[] = {"tftp", NULL, NULL, NULL};
@@ -32,7 +32,7 @@ static int do_get_tftp(struct cmd_tbl *cmdtp, const char *file_path,
tftp_argv[1] = file_addr;
tftp_argv[2] = (void *)file_path;
- if (do_tftpb(cmdtp, 0, 3, tftp_argv))
+ if (do_tftpb(ctx->cmdtp, 0, 3, tftp_argv))
return -ENOENT;
return 1;
@@ -121,8 +121,7 @@ do_pxe_get(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
struct pxe_context ctx;
int err, i = 0;
- pxe_setup_ctx(&ctx, cmdtp);
- do_getfile = do_get_tftp;
+ pxe_setup_ctx(&ctx, cmdtp, do_get_tftp);
if (argc != 1)
return CMD_RET_USAGE;
@@ -176,8 +175,7 @@ do_pxe_boot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
char *pxefile_addr_str;
struct pxe_context ctx;
- pxe_setup_ctx(&ctx, cmdtp);
- do_getfile = do_get_tftp;
+ pxe_setup_ctx(&ctx, cmdtp, do_get_tftp);
if (argc == 1) {
pxefile_addr_str = from_env("pxefile_addr_r");
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 280be55d9b3..2caae6d1555 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -94,9 +94,6 @@ static int get_bootfile_path(const char *file_path, char *bootfile_path,
return 1;
}
-int (*do_getfile)(struct cmd_tbl *cmdtp, const char *file_path,
- char *file_addr);
-
/*
* As in pxelinux, paths to files referenced from files we retrieve are
* relative to the location of bootfile. get_relfile takes such a path and
@@ -133,7 +130,7 @@ static int get_relfile(struct pxe_context *ctx, const char *file_path,
sprintf(addr_buf, "%lx", file_addr);
- return do_getfile(ctx->cmdtp, relfile, addr_buf);
+ return ctx->getfile(ctx, relfile, addr_buf);
}
int get_pxe_file(struct pxe_context *ctx, const char *file_path,
@@ -1434,7 +1431,9 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg)
boot_unattempted_labels(ctx, cfg);
}
-void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp)
+void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp,
+ pxe_getfile_func getfile)
{
ctx->cmdtp = cmdtp;
+ ctx->getfile = getfile;
}
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index cd0d3371765..ca2696f48b0 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -77,16 +77,28 @@ struct pxe_menu {
extern bool is_pxe;
-extern int (*do_getfile)(struct cmd_tbl *cmdtp, const char *file_path,
- char *file_addr);
+struct pxe_context;
+typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path,
+ char *file_addr);
/**
* struct pxe_context - context information for PXE parsing
*
* @cmdtp: Pointer to command table to use when calling other commands
+ * @getfile: Function called by PXE to read a file
*/
struct pxe_context {
struct cmd_tbl *cmdtp;
+ /**
+ * getfile() - read a file
+ *
+ * @ctx: PXE context
+ * @file_path: Path to the file
+ * @file_addr: String containing the hex address to put the file in
+ * memory
+ * Return 0 if OK, -ve on error
+ */
+ pxe_getfile_func getfile;
};
/**
@@ -179,7 +191,9 @@ int format_mac_pxe(char *outbuf, size_t outbuf_len);
*
* @ctx: Context to set up
* @cmdtp: Command table entry which started this action
+ * @getfile: Function to call to read a file
*/
-void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp);
+void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp,
+ pxe_getfile_func getfile);
#endif /* __PXE_UTILS_H */
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 9ba713c8aae..082f23543d1 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -8,7 +8,7 @@
static char *fs_argv[5];
-static int do_get_ext2(struct cmd_tbl *cmdtp, const char *file_path,
+static int do_get_ext2(struct pxe_context *ctx, const char *file_path,
char *file_addr)
{
#ifdef CONFIG_CMD_EXT2
@@ -16,13 +16,13 @@ static int do_get_ext2(struct cmd_tbl *cmdtp, const char *file_path,
fs_argv[3] = file_addr;
fs_argv[4] = (void *)file_path;
- if (!do_ext2load(cmdtp, 0, 5, fs_argv))
+ if (!do_ext2load(ctx->cmdtp, 0, 5, fs_argv))
return 1;
#endif
return -ENOENT;
}
-static int do_get_fat(struct cmd_tbl *cmdtp, const char *file_path,
+static int do_get_fat(struct pxe_context *ctx, const char *file_path,
char *file_addr)
{
#ifdef CONFIG_CMD_FAT
@@ -30,13 +30,13 @@ static int do_get_fat(struct cmd_tbl *cmdtp, const char *file_path,
fs_argv[3] = file_addr;
fs_argv[4] = (void *)file_path;
- if (!do_fat_fsload(cmdtp, 0, 5, fs_argv))
+ if (!do_fat_fsload(ctx->cmdtp, 0, 5, fs_argv))
return 1;
#endif
return -ENOENT;
}
-static int do_get_any(struct cmd_tbl *cmdtp, const char *file_path,
+static int do_get_any(struct pxe_context *ctx, const char *file_path,
char *file_addr)
{
#ifdef CONFIG_CMD_FS_GENERIC
@@ -44,7 +44,7 @@ static int do_get_any(struct cmd_tbl *cmdtp, const char *file_path,
fs_argv[3] = file_addr;
fs_argv[4] = (void *)file_path;
- if (!do_load(cmdtp, 0, 5, fs_argv, FS_TYPE_ANY))
+ if (!do_load(ctx->cmdtp, 0, 5, fs_argv, FS_TYPE_ANY))
return 1;
#endif
return -ENOENT;
@@ -91,13 +91,13 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
env_set("bootfile", filename);
}
- pxe_setup_ctx(&ctx, cmdtp);
+ pxe_setup_ctx(&ctx, cmdtp, NULL);
if (strstr(argv[3], "ext2")) {
- do_getfile = do_get_ext2;
+ ctx.getfile = do_get_ext2;
} else if (strstr(argv[3], "fat")) {
- do_getfile = do_get_fat;
+ ctx.getfile = do_get_fat;
} else if (strstr(argv[3], "any")) {
- do_getfile = do_get_any;
+ ctx.getfile = do_get_any;
} else {
printf("Invalid filesystem: %s\n", argv[3]);
return 1;
--
2.33.0.685.g46640cef36-goog
next prev parent reply other threads:[~2021-09-27 15:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 15:23 [PATCH v2 00/18] pxe: Refactoring to tidy up and prepare for bootflow Simon Glass
2021-09-27 15:23 ` [PATCH v2 01/18] Create a new boot/ directory Simon Glass
2021-09-27 15:23 ` [PATCH v2 02/18] pxe: Move API comments to the header files Simon Glass
2021-09-27 15:23 ` [PATCH v2 03/18] pxe: Use a context pointer Simon Glass
2021-09-27 15:23 ` Simon Glass [this message]
2021-09-27 15:23 ` [PATCH v2 05/18] pxe: Add a userdata field to the context Simon Glass
2021-09-27 15:23 ` [PATCH v2 06/18] pxe: Tidy up the is_pxe global Simon Glass
2021-09-27 15:23 ` [PATCH v2 07/18] pxe: Move pxe_utils files Simon Glass
2021-09-27 15:23 ` [PATCH v2 08/18] pxe: Tidy up some comments in pxe_utils Simon Glass
2021-09-27 15:23 ` [PATCH v2 09/18] pxe: Tidy up code style a little " Simon Glass
2021-09-27 15:23 ` [PATCH v2 10/18] pxe: Move common parsing coding into pxe_util Simon Glass
2021-09-27 15:23 ` [PATCH v2 11/18] pxe: Clean up the use of bootfile Simon Glass
2021-09-27 15:23 ` [PATCH v2 12/18] pxe: Drop get_bootfile_path() Simon Glass
2021-09-27 15:23 ` [PATCH v2 13/18] lib: Add tests for simple_itoa() Simon Glass
2021-09-27 15:23 ` [PATCH v2 14/18] lib: Add a function to convert a string to a hex value Simon Glass
2021-09-27 15:23 ` [PATCH v2 15/18] pxe: Return the file size from the getfile() function Simon Glass
2021-09-27 15:23 ` [PATCH v2 16/18] pxe: Refactor sysboot to have one helper Simon Glass
2021-09-27 15:23 ` [PATCH v2 17/18] doc: Move distro boot doc to rST Simon Glass
2021-09-27 15:24 ` [PATCH v2 18/18] pxe: Allow calling the pxe_get logic directly Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927152400.433569-5-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=patrice.chotard@foss.st.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).