projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/hla, jtag/stlink: switch to command 'adapter serial'
[fw/openocd]
/
src
/
hello.c
diff --git
a/src/hello.c
b/src/hello.c
index 2e5c9289c19d08842f149f8e3756b5bf8b2d38f6..9d078c0e776cbc2f455a5b4662edefcbdb223560 100644
(file)
--- a/
src/hello.c
+++ b/
src/hello.c
@@
-12,30
+12,24
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include
"log.h"
+#include
<helper/log.h>
COMMAND_HANDLER(handle_foo_command)
{
if (CMD_ARGC < 1 || CMD_ARGC > 2)
COMMAND_HANDLER(handle_foo_command)
{
if (CMD_ARGC < 1 || CMD_ARGC > 2)
- {
- LOG_ERROR("%s: incorrect number of arguments", CMD_NAME);
return ERROR_COMMAND_SYNTAX_ERROR;
return ERROR_COMMAND_SYNTAX_ERROR;
- }
uint32_t address;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
const char *msg = "<unchanged>";
uint32_t address;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
const char *msg = "<unchanged>";
- if (CMD_ARGC == 2)
- {
+ if (CMD_ARGC == 2) {
bool enable;
COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
msg = enable ? "enable" : "disable";
bool enable;
COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
msg = enable ? "enable" : "disable";
@@
-50,7
+44,7
@@
static bool foo_flag;
COMMAND_HANDLER(handle_flag_command)
{
return CALL_COMMAND_HANDLER(handle_command_parse_bool,
COMMAND_HANDLER(handle_flag_command)
{
return CALL_COMMAND_HANDLER(handle_command_parse_bool,
-
&foo_flag, "foo flag");
+ &foo_flag, "foo flag");
}
static const struct command_registration foo_command_handlers[] = {
}
static const struct command_registration foo_command_handlers[] = {
@@
-58,19
+52,22
@@
static const struct command_registration foo_command_handlers[] = {
.name = "bar",
.handler = &handle_foo_command,
.mode = COMMAND_ANY,
.name = "bar",
.handler = &handle_foo_command,
.mode = COMMAND_ANY,
- .help = "<address> [enable|disable] - an example command",
+ .usage = "address ['enable'|'disable']",
+ .help = "an example command",
},
{
.name = "baz",
.handler = &handle_foo_command,
.mode = COMMAND_ANY,
},
{
.name = "baz",
.handler = &handle_foo_command,
.mode = COMMAND_ANY,
- .help = "<address> [enable|disable] - a sample command",
+ .usage = "address ['enable'|'disable']",
+ .help = "a sample command",
},
{
.name = "flag",
.handler = &handle_flag_command,
.mode = COMMAND_ANY,
},
{
.name = "flag",
.handler = &handle_flag_command,
.mode = COMMAND_ANY,
- .help = "[on|off] - set a flag",
+ .usage = "[on|off]",
+ .help = "set a flag",
},
COMMAND_REGISTRATION_DONE
};
},
COMMAND_REGISTRATION_DONE
};
@@
-78,16
+75,11
@@
static const struct command_registration foo_command_handlers[] = {
static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
{
if (CMD_ARGC > 1)
static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
{
if (CMD_ARGC > 1)
- {
- LOG_ERROR("%s: too many arguments", CMD_NAME);
return ERROR_COMMAND_SYNTAX_ERROR;
return ERROR_COMMAND_SYNTAX_ERROR;
- }
- if (1 == CMD_ARGC)
- {
+ if (1 == CMD_ARGC) {
*sep = " ";
*name = CMD_ARGV[0];
*sep = " ";
*name = CMD_ARGV[0];
- }
- else
+ } else
*sep = *name = "";
return ERROR_OK;
*sep = *name = "";
return ERROR_OK;
@@
-96,30
+88,25
@@
COMMAND_HANDLER(handle_hello_command)
{
const char *sep, *name;
int retval = CALL_COMMAND_HANDLER(handle_hello_args, &sep, &name);
{
const char *sep, *name;
int retval = CALL_COMMAND_HANDLER(handle_hello_args, &sep, &name);
- if (
ERROR_OK == retval
)
- command_print(CMD
_CTX
, "Greetings%s%s!", sep, name);
+ if (
retval == ERROR_OK
)
+ command_print(CMD, "Greetings%s%s!", sep, name);
return retval;
}
const struct command_registration hello_command_handlers[] = {
{
.name = "hello",
return retval;
}
const struct command_registration hello_command_handlers[] = {
{
.name = "hello",
- .handler =
&
handle_hello_command,
+ .handler = handle_hello_command,
.mode = COMMAND_ANY,
.help = "prints a warm welcome",
.mode = COMMAND_ANY,
.help = "prints a warm welcome",
- .usage = "[
<name>
]",
+ .usage = "[
name
]",
},
{
.name = "foo",
.mode = COMMAND_ANY,
.help = "example command handler skeleton",
},
{
.name = "foo",
.mode = COMMAND_ANY,
.help = "example command handler skeleton",
-
.chain = foo_command_handlers,
.chain = foo_command_handlers,
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
},
COMMAND_REGISTRATION_DONE
};
-
-int hello_register_commands(struct command_context *cmd_ctx)
-{
- return register_commands(cmd_ctx, NULL, hello_command_handlers);
-}