X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhello.c;h=9d078c0e776cbc2f455a5b4662edefcbdb223560;hb=e7e46ba61e6d0bf06f65f352e8607db1dda83da1;hp=8c97a401e85f34ef5025bf314f0934f5c7430998;hpb=833e7f5248778bcb31b4db1a1b91160995415203;p=fw%2Fopenocd
diff --git a/src/hello.c b/src/hello.c
index 8c97a401e..9d078c0e7 100644
--- 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 *
- * 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 . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include
#endif
-#include "log.h"
+#include
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;
- }
uint32_t address;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
const char *msg = "";
- if (CMD_ARGC == 2)
- {
+ if (CMD_ARGC == 2) {
bool enable;
COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
msg = enable ? "enable" : "disable";
@@ -50,42 +44,42 @@ static bool foo_flag;
COMMAND_HANDLER(handle_flag_command)
{
return CALL_COMMAND_HANDLER(handle_command_parse_bool,
- &foo_flag, "foo flag");
+ &foo_flag, "foo flag");
}
-int foo_register_commands(struct command_context *cmd_ctx)
-{
- // register several commands under the foo command
- struct command *cmd = COMMAND_REGISTER(cmd_ctx, NULL, "foo",
- NULL, COMMAND_ANY, "foo: command handler skeleton");
-
- COMMAND_REGISTER(cmd_ctx, cmd, "bar",
- &handle_foo_command, COMMAND_ANY,
- " [enable|disable] - an example command");
- COMMAND_REGISTER(cmd_ctx, cmd, "baz",
- &handle_foo_command, COMMAND_ANY,
- " [enable|disable] - a sample command");
-
- COMMAND_REGISTER(cmd_ctx, cmd, "flag",
- &handle_flag_command, COMMAND_ANY,
- "[on|off] - set a flag");
-
- return ERROR_OK;
-}
+static const struct command_registration foo_command_handlers[] = {
+ {
+ .name = "bar",
+ .handler = &handle_foo_command,
+ .mode = COMMAND_ANY,
+ .usage = "address ['enable'|'disable']",
+ .help = "an example command",
+ },
+ {
+ .name = "baz",
+ .handler = &handle_foo_command,
+ .mode = COMMAND_ANY,
+ .usage = "address ['enable'|'disable']",
+ .help = "a sample command",
+ },
+ {
+ .name = "flag",
+ .handler = &handle_flag_command,
+ .mode = COMMAND_ANY,
+ .usage = "[on|off]",
+ .help = "set a flag",
+ },
+ COMMAND_REGISTRATION_DONE
+};
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;
- }
- if (1 == CMD_ARGC)
- {
+ if (1 == CMD_ARGC) {
*sep = " ";
*name = CMD_ARGV[0];
- }
- else
+ } else
*sep = *name = "";
return ERROR_OK;
@@ -94,17 +88,25 @@ COMMAND_HANDLER(handle_hello_command)
{
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;
}
-int hello_register_commands(struct command_context *cmd_ctx)
-{
- foo_register_commands(cmd_ctx);
-
- struct command *cmd = COMMAND_REGISTER(cmd_ctx, NULL, "hello",
- &handle_hello_command, COMMAND_ANY,
- "[] - prints a warm welcome");
- return cmd ? ERROR_OK : -ENOMEM;
-}
+const struct command_registration hello_command_handlers[] = {
+ {
+ .name = "hello",
+ .handler = handle_hello_command,
+ .mode = COMMAND_ANY,
+ .help = "prints a warm welcome",
+ .usage = "[name]",
+ },
+ {
+ .name = "foo",
+ .mode = COMMAND_ANY,
+ .help = "example command handler skeleton",
+ .chain = foo_command_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};