mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-03 10:00:42 +09:00
sandbox: Rename sb_cmdline_option to sandbox_cmdline_option
The new name is longer but more clearly related to sandbox. This is in a separate patch within the same series since some comments on the SPI series rely on it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Hung-ying Tyan <tyanh@chromium.org>
This commit is contained in:
parent
f44483b57c
commit
7b3efc6699
@ -161,7 +161,7 @@ static struct option *long_opts;
|
|||||||
|
|
||||||
int os_parse_args(struct sandbox_state *state, int argc, char *argv[])
|
int os_parse_args(struct sandbox_state *state, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
struct sb_cmdline_option **sb_opt = __u_boot_sandbox_option_start;
|
struct sandbox_cmdline_option **sb_opt = __u_boot_sandbox_option_start;
|
||||||
size_t num_options = __u_boot_sandbox_option_count();
|
size_t num_options = __u_boot_sandbox_option_count();
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
int sandbox_early_getopt_check(void)
|
int sandbox_early_getopt_check(void)
|
||||||
{
|
{
|
||||||
struct sandbox_state *state = state_get_current();
|
struct sandbox_state *state = state_get_current();
|
||||||
struct sb_cmdline_option **sb_opt = __u_boot_sandbox_option_start;
|
struct sandbox_cmdline_option **sb_opt = __u_boot_sandbox_option_start;
|
||||||
size_t num_options = __u_boot_sandbox_option_count();
|
size_t num_options = __u_boot_sandbox_option_count();
|
||||||
size_t i;
|
size_t i;
|
||||||
int max_arg_len, max_noarg_len;
|
int max_arg_len, max_noarg_len;
|
||||||
@ -40,7 +40,7 @@ int sandbox_early_getopt_check(void)
|
|||||||
max_noarg_len = max_arg_len + 7;
|
max_noarg_len = max_arg_len + 7;
|
||||||
|
|
||||||
for (i = 0; i < num_options; ++i) {
|
for (i = 0; i < num_options; ++i) {
|
||||||
struct sb_cmdline_option *opt = sb_opt[i];
|
struct sandbox_cmdline_option *opt = sb_opt[i];
|
||||||
|
|
||||||
/* first output the short flag if it has one */
|
/* first output the short flag if it has one */
|
||||||
if (opt->flag_short >= 0x100)
|
if (opt->flag_short >= 0x100)
|
||||||
@ -61,12 +61,12 @@ int sandbox_early_getopt_check(void)
|
|||||||
os_exit(0);
|
os_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sb_cmdline_cb_help(struct sandbox_state *state, const char *arg)
|
static int sandbox_cmdline_cb_help(struct sandbox_state *state, const char *arg)
|
||||||
{
|
{
|
||||||
/* just flag to sandbox_early_getopt_check to show usage */
|
/* just flag to sandbox_early_getopt_check to show usage */
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
SB_CMDLINE_OPT_SHORT(help, 'h', 0, "Display help");
|
SANDBOX_CMDLINE_OPT_SHORT(help, 'h', 0, "Display help");
|
||||||
|
|
||||||
int sandbox_main_loop_init(void)
|
int sandbox_main_loop_init(void)
|
||||||
{
|
{
|
||||||
@ -81,19 +81,20 @@ int sandbox_main_loop_init(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sb_cmdline_cb_command(struct sandbox_state *state, const char *arg)
|
static int sandbox_cmdline_cb_command(struct sandbox_state *state,
|
||||||
|
const char *arg)
|
||||||
{
|
{
|
||||||
state->cmd = arg;
|
state->cmd = arg;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
SB_CMDLINE_OPT_SHORT(command, 'c', 1, "Execute U-Boot command");
|
SANDBOX_CMDLINE_OPT_SHORT(command, 'c', 1, "Execute U-Boot command");
|
||||||
|
|
||||||
static int sb_cmdline_cb_fdt(struct sandbox_state *state, const char *arg)
|
static int sandbox_cmdline_cb_fdt(struct sandbox_state *state, const char *arg)
|
||||||
{
|
{
|
||||||
state->fdt_fname = arg;
|
state->fdt_fname = arg;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
SB_CMDLINE_OPT_SHORT(fdt, 'd', 1, "Specify U-Boot's control FDT");
|
SANDBOX_CMDLINE_OPT_SHORT(fdt, 'd', 1, "Specify U-Boot's control FDT");
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@ struct sandbox_state;
|
|||||||
* consumer code should focus on the macros below and
|
* consumer code should focus on the macros below and
|
||||||
* the callback function.
|
* the callback function.
|
||||||
*/
|
*/
|
||||||
struct sb_cmdline_option {
|
struct sandbox_cmdline_option {
|
||||||
/* The long flag name: "help" for "--help" */
|
/* The long flag name: "help" for "--help" */
|
||||||
const char *flag;
|
const char *flag;
|
||||||
/* The (optional) short flag name: "h" for "-h" */
|
/* The (optional) short flag name: "h" for "-h" */
|
||||||
@ -35,18 +35,19 @@ struct sb_cmdline_option {
|
|||||||
* Internal macro to expand the lower macros into the necessary
|
* Internal macro to expand the lower macros into the necessary
|
||||||
* magic junk that makes this all work.
|
* magic junk that makes this all work.
|
||||||
*/
|
*/
|
||||||
#define _SB_CMDLINE_OPT(f, s, ha, h) \
|
#define _SANDBOX_CMDLINE_OPT(f, s, ha, h) \
|
||||||
static struct sb_cmdline_option sb_cmdline_option_##f = { \
|
static struct sandbox_cmdline_option sandbox_cmdline_option_##f = { \
|
||||||
.flag = #f, \
|
.flag = #f, \
|
||||||
.flag_short = s, \
|
.flag_short = s, \
|
||||||
.help = h, \
|
.help = h, \
|
||||||
.has_arg = ha, \
|
.has_arg = ha, \
|
||||||
.callback = sb_cmdline_cb_##f, \
|
.callback = sandbox_cmdline_cb_##f, \
|
||||||
}; \
|
}; \
|
||||||
/* Ppointer to the struct in a special section for the linker script */ \
|
/* Ppointer to the struct in a special section for the linker script */ \
|
||||||
static __attribute__((section(".u_boot_sandbox_getopt"), used)) \
|
static __attribute__((section(".u_boot_sandbox_getopt"), used)) \
|
||||||
struct sb_cmdline_option *sb_cmdline_option_##f##_ptr = \
|
struct sandbox_cmdline_option \
|
||||||
&sb_cmdline_option_##f
|
*sandbox_cmdline_option_##f##_ptr = \
|
||||||
|
&sandbox_cmdline_option_##f
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Macros for end code to declare new command line flags.
|
* Macros for end code to declare new command line flags.
|
||||||
@ -56,16 +57,16 @@ struct sb_cmdline_option {
|
|||||||
* @param h The help string displayed when showing --help
|
* @param h The help string displayed when showing --help
|
||||||
*
|
*
|
||||||
* This invocation:
|
* This invocation:
|
||||||
* SB_CMDLINE_OPT(foo, 0, "The foo arg");
|
* SANDBOX_CMDLINE_OPT(foo, 0, "The foo arg");
|
||||||
* Will create a new flag named "--foo" (no short option) that takes
|
* Will create a new flag named "--foo" (no short option) that takes
|
||||||
* no argument. If the user specifies "--foo", then the callback func
|
* no argument. If the user specifies "--foo", then the callback func
|
||||||
* sb_cmdline_cb_foo() will automatically be called.
|
* sandbox_cmdline_cb_foo() will automatically be called.
|
||||||
*/
|
*/
|
||||||
#define SB_CMDLINE_OPT(f, ha, h) _SB_CMDLINE_OPT(f, 0, ha, h)
|
#define SANDBOX_CMDLINE_OPT(f, ha, h) _SANDBOX_CMDLINE_OPT(f, 0, ha, h)
|
||||||
/*
|
/*
|
||||||
* Same as above, but @s is used to specify a short flag e.g.
|
* Same as above, but @s is used to specify a short flag e.g.
|
||||||
* SB_CMDLINE_OPT(foo, 'f', 0, "The foo arg");
|
* SANDBOX_CMDLINE_OPT(foo, 'f', 0, "The foo arg");
|
||||||
*/
|
*/
|
||||||
#define SB_CMDLINE_OPT_SHORT(f, s, ha, h) _SB_CMDLINE_OPT(f, s, ha, h)
|
#define SANDBOX_CMDLINE_OPT_SHORT(f, s, ha, h) _SANDBOX_CMDLINE_OPT(f, s, ha, h)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
#include <asm-generic/sections.h>
|
#include <asm-generic/sections.h>
|
||||||
|
|
||||||
struct sb_cmdline_option;
|
struct sandbox_cmdline_option;
|
||||||
|
|
||||||
extern struct sb_cmdline_option *__u_boot_sandbox_option_start[],
|
extern struct sandbox_cmdline_option *__u_boot_sandbox_option_start[],
|
||||||
*__u_boot_sandbox_option_end[];
|
*__u_boot_sandbox_option_end[];
|
||||||
|
|
||||||
static inline size_t __u_boot_sandbox_option_count(void)
|
static inline size_t __u_boot_sandbox_option_count(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user