diff options
author | Holger Schurig <holgerschurig@gmail.com> | 2014-05-13 10:28:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-14 10:03:43 +0200 |
commit | f1f532084a6e9ee8225f047353999b459455df7e (patch) | |
tree | f2b8b1f25c5c630209c6970e3a7ce57a3d55d367 /commands/flash.c | |
parent | ab23d0bb3f66cfb7a97a8aa6b8007687ed7a6925 (diff) | |
download | barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.gz barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.xz |
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/flash.c')
-rw-r--r-- | commands/flash.c | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/commands/flash.c b/commands/flash.c index e6c30bffd2..b50a32702e 100644 --- a/commands/flash.c +++ b/commands/flash.c @@ -75,13 +75,19 @@ out: } BAREBOX_CMD_HELP_START(erase) -BAREBOX_CMD_HELP_USAGE("erase <device> [area]\n") -BAREBOX_CMD_HELP_SHORT("Erase a flash device or parts of a device if an area specification is given.\n") +BAREBOX_CMD_HELP_TEXT("Erase the flash memory handled by DEVICE. Which AREA will be erased") +BAREBOX_CMD_HELP_TEXT("depends on the device: If the device represents the whole flash") +BAREBOX_CMD_HELP_TEXT("memory, the whole memory will be erased. If the device represents a") +BAREBOX_CMD_HELP_TEXT("partition on a main flash memory, only this partition part will be") +BAREBOX_CMD_HELP_TEXT("erased.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Use 'addpart' and 'delpart' to manage partitions.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(erase) .cmd = do_flerase, - .usage = "erase FLASH memory", + BAREBOX_CMD_DESC("erase flash memory") + BAREBOX_CMD_OPTS("DEVICE [AREA]") BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_erase_help) BAREBOX_CMD_END @@ -150,13 +156,19 @@ out: } BAREBOX_CMD_HELP_START(protect) -BAREBOX_CMD_HELP_USAGE("protect <device> [area]\n") -BAREBOX_CMD_HELP_SHORT("protect a flash device (or parts of a device, if an area is specified)\n") +BAREBOX_CMD_HELP_TEXT("Protect the flash memory behind the device. It depends on the device") +BAREBOX_CMD_HELP_TEXT("given, what area will be protected. If the device represents the whole") +BAREBOX_CMD_HELP_TEXT("flash memory, the whole memory will be protected. If the device") +BAREBOX_CMD_HELP_TEXT("represents a partition on a main flash memory, only this partition part") +BAREBOX_CMD_HELP_TEXT("will be protected.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Use 'addpart' and 'delpart' to manage partitions.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(protect) .cmd = do_protect, - .usage = "enable flash write protection", + BAREBOX_CMD_DESC("enable flash write protection") + BAREBOX_CMD_OPTS("DEVICE [AREA]") BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_protect_help) BAREBOX_CMD_END @@ -164,8 +176,8 @@ BAREBOX_CMD_END /** * @page protect_command -Protect the flash memory behind the device. It depends on the device -given, what area will be protected. If the device represents the whole + +If the device represents the whole flash memory the whole memory will be protected. If the device represents a partition on a main flash memory, only this partition part will be protected. @@ -179,13 +191,17 @@ flashes here. */ BAREBOX_CMD_HELP_START(unprotect) -BAREBOX_CMD_HELP_USAGE("unprotect <device> [area]\n") -BAREBOX_CMD_HELP_SHORT("unprotect a flash device (or parts of a device, if an area is specified)\n") +BAREBOX_CMD_HELP_TEXT("Unprotect the flash memory behind the device. It depends on the device") +BAREBOX_CMD_HELP_TEXT("given, what area will be unprotected. If the device represents the whole") +BAREBOX_CMD_HELP_TEXT("flash memory, the whole memory will be unprotected. If the device") +BAREBOX_CMD_HELP_TEXT("represents a partition on a main flash memory, only this partition part") +BAREBOX_CMD_HELP_TEXT("will be unprotected.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(unprotect) .cmd = do_protect, - .usage = "disable flash write protection", + BAREBOX_CMD_DESC("disable flash write protection") + BAREBOX_CMD_OPTS("DEVICE [AREA]") BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_unprotect_help) BAREBOX_CMD_END @@ -193,7 +209,7 @@ BAREBOX_CMD_END /** * @page unprotect_command -Unprotect the flash memory behind the device. It depends on the device given, +It depends on the device given, what area will be unprotected. If the device represents the whole flash memory the whole memory will be unprotected. If the device represents a partition on a main flash memory, only this partition part will be unprotected. |