From 09140113108541b95d340f3c7b6ee597d31ccc73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:03 -0600 Subject: command: Remove the cmd_tbl_t typedef We should not use typedefs in U-Boot. They cannot be used as forward declarations which means that header files must include the full header to access them. Drop the typedef and rename the struct to remove the _s suffix which is now not useful. This requires quite a few header-file additions. Signed-off-by: Simon Glass --- doc/README.commands | 12 ++++++------ doc/README.standalone | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/README.commands b/doc/README.commands index 4e9e809..716ad22 100644 --- a/doc/README.commands +++ b/doc/README.commands @@ -3,7 +3,7 @@ Command definition Commands are added to U-Boot by creating a new command structure. This is done by first including command.h, then using the U_BOOT_CMD() or the -U_BOOT_CMD_COMPLETE macro to fill in a cmd_tbl_t struct. +U_BOOT_CMD_COMPLETE macro to fill in a struct cmd_tbl struct. U_BOOT_CMD(name, maxargs, repeatable, command, "usage", "help") U_BOOT_CMD_COMPLETE(name, maxargs, repeatable, command, "usage, "help", comp) @@ -31,7 +31,7 @@ comp: Pointer to the completion function. May be NULL. Sub-command definition ---------------------- -Likewise an array of cmd_tbl_t holding sub-commands can be created using either +Likewise an array of struct cmd_tbl holding sub-commands can be created using either of the following macros: * U_BOOT_CMD_MKENT(name, maxargs, repeatable, command, "usage", "help") @@ -40,14 +40,14 @@ of the following macros: This table has to be evaluated in the command function of the main command, e.g. - static cmd_tbl_t cmd_sub[] = { + static struct cmd_tbl cmd_sub[] = { U_BOOT_CMD_MKENT(foo, CONFIG_SYS_MAXARGS, 1, do_foo, "", ""), U_BOOT_CMD_MKENT(bar, CONFIG_SYS_MAXARGS, 1, do_bar, "", ""), }; - static int do_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + static int do_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - cmd_tbl_t *cp; + struct cmd_tbl *cp; if (argc < 2) return CMD_RET_USAGE; @@ -68,7 +68,7 @@ Command function ---------------- The command function pointer has to be of type -int (*cmd)(struct cmd_tbl_s *cmdtp, int flag, int argc, const char *argv[]); +int (*cmd)(struct cmd_tbl *cmdtp, int flag, int argc, const char *argv[]); cmdtp: Table entry describing the command (see above). diff --git a/doc/README.standalone b/doc/README.standalone index 28ebde1..874ca2f 100644 --- a/doc/README.standalone +++ b/doc/README.standalone @@ -40,7 +40,7 @@ Design Notes on Exporting U-Boot Functions to Standalone Applications: that returns the ABI version of the running U-Boot. I.e., a typical application startup may look like this: - int my_app (int argc, char * const argv[]) + int my_app (int argc, char *const argv[]) { app_startup (argv); if (get_version () != XF_VERSION) -- cgit v1.1