projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
arch
/
sandbox
/
include
/
asm
/
getopt.h
diff --git
a/arch/sandbox/include/asm/getopt.h
b/arch/sandbox/include/asm/getopt.h
index 685883cd3f6449dfb9ed6d8e0713a545c94be4b5..3048c2cc30ba9bac1f6013df9f82a23ad347084f 100644
(file)
--- a/
arch/sandbox/include/asm/getopt.h
+++ b/
arch/sandbox/include/asm/getopt.h
@@
-18,7
+18,7
@@
struct sandbox_state;
* consumer code should focus on the macros below and
* the callback function.
*/
* consumer code should focus on the macros below and
* the callback function.
*/
-struct s
b
_cmdline_option {
+struct s
andbox
_cmdline_option {
/* The long flag name: "help" for "--help" */
const char *flag;
/* The (optional) short flag name: "h" for "-h" */
/* The long flag name: "help" for "--help" */
const char *flag;
/* 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
* magic junk that makes this all work.
*/
* Internal macro to expand the lower macros into the necessary
* magic junk that makes this all work.
*/
-#define _S
B
_CMDLINE_OPT(f, s, ha, h) \
- static struct s
b_cmdline_option sb
_cmdline_option_##f = { \
+#define _S
ANDBOX
_CMDLINE_OPT(f, s, ha, h) \
+ static struct s
andbox_cmdline_option sandbox
_cmdline_option_##f = { \
.flag = #f, \
.flag_short = s, \
.help = h, \
.has_arg = ha, \
.flag = #f, \
.flag_short = s, \
.help = h, \
.has_arg = ha, \
- .callback = s
b
_cmdline_cb_##f, \
+ .callback = s
andbox
_cmdline_cb_##f, \
}; \
/* Ppointer to the struct in a special section for the linker script */ \
static __attribute__((section(".u_boot_sandbox_getopt"), used)) \
}; \
/* Ppointer to the struct in a special section for the linker script */ \
static __attribute__((section(".u_boot_sandbox_getopt"), used)) \
- struct sb_cmdline_option *sb_cmdline_option_##f##_ptr = \
- &sb_cmdline_option_##f
+ struct sandbox_cmdline_option \
+ *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
*
* This invocation:
* @param h The help string displayed when showing --help
*
* This invocation:
- * S
B
_CMDLINE_OPT(foo, 0, "The foo arg");
+ * S
ANDBOX
_CMDLINE_OPT(foo, 0, "The foo arg");
* Will create a new flag named "--foo" (no short option) that takes
* no argument. If the user specifies "--foo", then the callback func
* Will create a new flag named "--foo" (no short option) that takes
* no argument. If the user specifies "--foo", then the callback func
- * s
b
_cmdline_cb_foo() will automatically be called.
+ * s
andbox
_cmdline_cb_foo() will automatically be called.
*/
*/
-#define S
B_CMDLINE_OPT(f, ha, h) _SB
_CMDLINE_OPT(f, 0, ha, h)
+#define S
ANDBOX_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.
- * S
B
_CMDLINE_OPT(foo, 'f', 0, "The foo arg");
+ * S
ANDBOX
_CMDLINE_OPT(foo, 'f', 0, "The foo arg");
*/
*/
-#define S
B_CMDLINE_OPT_SHORT(f, s, ha, h) _SB
_CMDLINE_OPT(f, s, ha, h)
+#define S
ANDBOX_CMDLINE_OPT_SHORT(f, s, ha, h) _SANDBOX
_CMDLINE_OPT(f, s, ha, h)
#endif
#endif