drivers/cmsis_dap_usb: remove jtag reset hacks

This should no longer be needed after tcl scripts are fixed to avoid
calling jtag subcommands when jtag is not used.

Barely tested with an frdm board.

Change-Id: I75f02b088e6134562ae634417d97c48e377df6e9
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2130
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c
index 6276595f4e381b92a09c377472edd02be59296a3..8c815230d475d199976f624677540139b44785fc 100644 (file)
--- a/src/jtag/drivers/cmsis_dap_usb.c
+++ b/src/jtag/drivers/cmsis_dap_usb.c
@@ -975,73 +975,6 @@ static const struct command_registration cmsis_dap_subcommand_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-COMMAND_HANDLER(cmsis_dap_reset_command)
-{
-       LOG_DEBUG("cmsis_dap_reset_command");
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(cmsis_dap_jtag_command)
-{
-       LOG_DEBUG("cmsis_dap_jtag_command");
-       return ERROR_OK;
-}
-
-static const struct command_registration cmsis_dap_jtag_subcommand_handlers[] = {
-       {
-               .name = "init",
-               .mode = COMMAND_ANY,
-               .handler = cmsis_dap_jtag_command,
-               .usage = ""
-        },
-       {
-               .name = "arp_init",
-               .mode = COMMAND_ANY,
-               .handler = cmsis_dap_jtag_command,
-               .usage = ""
-        },
-       {
-               .name = "arp_init-reset",
-               .mode = COMMAND_ANY,
-               .handler = cmsis_dap_reset_command,
-               .usage = ""
-        },
-       {
-               .name = "tapisenabled",
-               .mode = COMMAND_EXEC,
-               .jim_handler = jim_jtag_tap_enabler,
-        },
-       {
-               .name = "tapenable",
-               .mode = COMMAND_EXEC,
-               .jim_handler = jim_jtag_tap_enabler,
-        },
-       {
-               .name = "tapdisable",
-               .mode = COMMAND_EXEC,
-               .handler = cmsis_dap_jtag_command,
-               .usage = "",
-        },
-       {
-               .name = "configure",
-               .mode = COMMAND_EXEC,
-               .handler = cmsis_dap_jtag_command,
-               .usage = "",
-        },
-       {
-               .name = "cget",
-               .mode = COMMAND_EXEC,
-               .jim_handler = jim_jtag_configure,
-        },
-       {
-               .name = "names",
-               .mode = COMMAND_ANY,
-               .handler = cmsis_dap_jtag_command,
-               .usage = "",
-        },
-        COMMAND_REGISTRATION_DONE
-};
-
 static const struct command_registration cmsis_dap_command_handlers[] = {
        {
                .name = "cmsis-dap",
@@ -1057,14 +990,6 @@ static const struct command_registration cmsis_dap_command_handlers[] = {
                .help = "the vendor ID and product ID of the CMSIS-DAP device",
                .usage = "(vid pid)* ",
        },
-       {
-               /* this is currently a nasty hack so we get
-                * reset working with non jtag interfaces */
-               .name = "jtag",
-               .mode = COMMAND_ANY,
-               .usage = "",
-               .chain = cmsis_dap_jtag_subcommand_handlers,
-       },
        COMMAND_REGISTRATION_DONE
 };