diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-18 06:00:26 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-18 15:51:07 -0800 |
| commit | f382ebae1050fe26f25d13fd558277d8a032c778 (patch) | |
| tree | fabf5a7b19db62606f127aa40a22d4cd56e5bb07 | |
| parent | c0d14dc7f19d785702eee5f69de5b1a63902554b (diff) | |
fix zy1000 command handler
Rewrite ZY1000 power command handler to use new macros, simplify logic.
Remove unused port command handler declaration.
| -rw-r--r-- | src/jtag/zy1000/zy1000.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 206b362c..28515c77 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -46,9 +46,6 @@ int zy1000_register_commands(struct command_context *cmd_ctx); int zy1000_init(void); int zy1000_quit(void); -/* interface commands */ -int zy1000_handle_zy1000_port_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc); - static int zy1000_khz(int khz, int *jtag_speed) { if (khz == 0) @@ -227,21 +224,22 @@ static void setPower(bool power) } } -int handle_power_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_power_command) { - if (argc > 1) - { - return ERROR_INVALID_ARGUMENTS; - } - - if (argc == 1) + switch (CMD_ARGC) { + case 1: { bool enable; - COMMAND_PARSE_ON_OFF(args[0], enable); + COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable); setPower(enable); + // fall through + } + case 0: + command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off"); + break; + default: + return ERROR_INVALID_ARGUMENTS; } - - command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off"); return ERROR_OK; } |