fix zy1000 command handler

Rewrite ZY1000 power command handler to use new macros, simplify logic.

Remove unused port command handler declaration.

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 206b362c6258502cc3c2ccf9c07ce3743ff2fa6b..28515c77bee1010bff32d90650087328f6b11f4a 100644 (file)
--- 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);
 
 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)
 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;
                bool enable;

-               COMMAND_PARSE_ON_OFF(args[0], enable);
+               COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);

                setPower(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;
 }
 
        return ERROR_OK;
 }