libusb-1.0 support
[fw/openocd] / src / jtag / tcl.c
index d587922bb259e8eb3ba96a21b3dfcad9563ebc1f..b634ac0db57211440248d3174a529f0e0fd02806 100644 (file)
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2009 SoftPLC Corporation                                *
 #include <strings.h>
 #endif
 
+#include <helper/time_support.h>
+
+/**
+ * @file
+ * Holds support for accessing JTAG-specific mechanisms from TCl scripts.
+ */
+
 static const Jim_Nvp nvp_jtag_tap_event[] = {
        { .value = JTAG_TRST_ASSERTED,          .name = "post-reset" },
        { .value = JTAG_TAP_EVENT_SETUP,        .name = "setup" },
@@ -58,7 +65,7 @@ struct jtag_tap *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *o)
        if (NULL == cp)
                cp = "(unknown)";
        if (NULL == t)
-               Jim_SetResult_sprintf(interp, "Tap '%s' could not be found", cp);
+               Jim_SetResultFormatted(interp, "Tap '%s' could not be found", cp);
        return t;
 }
 
@@ -140,7 +147,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
                        endstate = tap_state_by_name(cp);
                        if (endstate < 0) {
                                /* update the error message */
-                               Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
+                               Jim_SetResultFormatted(interp,"endstate: %s invalid", cp);
                        } else {
                                if (!scan_is_safe(endstate))
                                        LOG_WARNING("drscan with unsafe "
@@ -159,12 +166,15 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
                }
        } /* validate args */
 
+       assert(e == JIM_OK);
+
        tap = jtag_tap_by_jim_obj(interp, args[1]);
        if (tap == NULL) {
                return JIM_ERR;
        }
 
        num_fields = (argc-2)/2;
+       assert(num_fields > 0);
        fields = malloc(sizeof(struct scan_field) * num_fields);
        for (i = 2; i < argc; i += 2)
        {
@@ -176,9 +186,10 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
                str = Jim_GetString(args[i + 1], &len);
 
                fields[field_count].num_bits = bits;
-               fields[field_count].out_value = malloc(DIV_ROUND_UP(bits, 8));
-               str_to_buf(str, len, fields[field_count].out_value, bits, 0);
-               fields[field_count].in_value = fields[field_count].out_value;
+               void * t = malloc(DIV_ROUND_UP(bits, 8));
+               fields[field_count].out_value = t;
+               str_to_buf(str, len, t, bits, 0);
+               fields[field_count].in_value = t;
                field_count++;
        }
 
@@ -200,7 +211,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
 
                Jim_GetLong(interp, args[i], &bits);
                str = buf_to_str(fields[field_count].in_value, bits, 16);
-               free(fields[field_count].out_value);
+               free((void *)fields[field_count].out_value);
 
                Jim_ListAppendElement(interp, list, Jim_NewStringObj(interp, str, strlen(str)));
                free(str);
@@ -236,7 +247,7 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar
                if (states[i] < 0)
                {
                        /* update the error message */
-                       Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
+                       Jim_SetResultFormatted(interp,"endstate: %s invalid", cp);
                        return JIM_ERR;
                }
        }
@@ -413,7 +424,7 @@ static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, struct jtag_tap * tap)
                                return e;
                        break;
                default:
-                       Jim_SetResult_sprintf(goi->interp, "unknown event: %s", n->name);
+                       Jim_SetResultFormatted(goi->interp, "unknown event: %s", n->name);
                        return JIM_ERR;
                }
        }
@@ -437,7 +448,7 @@ static int jim_newtap_expected_id(Jim_Nvp *n, Jim_GetOptInfo *goi,
        jim_wide w;
        int e = Jim_GetOpt_Wide(goi, &w);
        if (e != JIM_OK) {
-               Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+               Jim_SetResultFormatted(goi->interp, "option: %s bad parameter", n->name);
                return e;
        }
 
@@ -445,7 +456,7 @@ static int jim_newtap_expected_id(Jim_Nvp *n, Jim_GetOptInfo *goi,
        uint32_t *new_expected_ids = malloc(expected_len + sizeof(uint32_t));
        if (new_expected_ids == NULL)
        {
-               Jim_SetResult_sprintf(goi->interp, "no memory");
+               Jim_SetResultFormatted(goi->interp, "no memory");
                return JIM_ERR;
        }
 
@@ -475,7 +486,7 @@ static int jim_newtap_ir_param(Jim_Nvp *n, Jim_GetOptInfo *goi,
        int e = Jim_GetOpt_Wide(goi, &w);
        if (e != JIM_OK)
        {
-               Jim_SetResult_sprintf(goi->interp,
+               Jim_SetResultFormatted(goi->interp,
                                "option: %s bad parameter", n->name);
                free((void *)pTap->dotted_name);
                return e;
@@ -539,7 +550,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 
        pTap = calloc(1, sizeof(struct jtag_tap));
        if (!pTap) {
-               Jim_SetResult_sprintf(goi->interp, "no memory");
+               Jim_SetResultFormatted(goi->interp, "no memory");
                return JIM_ERR;
        }
 
@@ -547,7 +558,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
         * we expect CHIP + TAP + OPTIONS
         * */
        if (goi->argc < 3) {
-               Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ....");
+               Jim_SetResultFormatted(goi->interp, "Missing CHIP TAP OPTIONS ....");
                free(pTap);
                return JIM_ERR;
        }
@@ -625,7 +636,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                return JIM_OK;
        }
 
-       Jim_SetResult_sprintf(goi->interp,
+       Jim_SetResultFormatted(goi->interp,
                        "newtap: %s missing IR length",
                        pTap->dotted_name);
        jtag_tap_free(pTap);
@@ -648,7 +659,8 @@ static void jtag_tap_handle_event(struct jtag_tap *tap, enum jtag_event e)
 
                if (Jim_EvalObj(jteap->interp, jteap->body) != JIM_OK)
                {
-                       Jim_PrintErrorMessage(jteap->interp);
+                       Jim_MakeErrorMessage(jteap->interp);
+                       LOG_USER("%s", Jim_GetString(Jim_GetResult(jteap->interp), NULL));
                        continue;
                }
 
@@ -670,24 +682,6 @@ static void jtag_tap_handle_event(struct jtag_tap *tap, enum jtag_event e)
        }
 }
 
-static int
-jim_jtag_interface(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
-{
-       Jim_GetOptInfo goi;
-       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
-
-       /* return the name of the interface */
-       /* TCL code might need to know the exact type... */
-       /* FUTURE: we allow this as a means to "set" the interface. */
-       if (goi.argc != 0) {
-               Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
-               return JIM_ERR;
-       }
-       const char *name = jtag_interface ? jtag_interface->name : NULL;
-       Jim_SetResultString(goi.interp, name ? : "undefined", -1);
-       return JIM_OK;
-}
-
 static int jim_jtag_arp_init(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
        Jim_GetOptInfo goi;
@@ -696,10 +690,12 @@ static int jim_jtag_arp_init(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
                return JIM_ERR;
        }
-       struct command_context *context = Jim_GetAssocData(interp, "context");
+       struct command_context *context = current_command_context(interp);
        int e = jtag_init_inner(context);
        if (e != ERROR_OK) {
-               Jim_SetResult_sprintf(goi.interp, "error: %d", e);
+               Jim_Obj *eObj = Jim_NewIntObj(goi.interp, e);
+               Jim_SetResultFormatted(goi.interp, "error: %#s", eObj);
+               Jim_FreeNewObj(goi.interp, eObj);
                return JIM_ERR;
        }
        return JIM_OK;
@@ -713,16 +709,18 @@ static int jim_jtag_arp_init_reset(Jim_Interp *interp, int argc, Jim_Obj *const
                Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
                return JIM_ERR;
        }
-       struct command_context *context = Jim_GetAssocData(interp, "context");
+       struct command_context *context = current_command_context(interp);
        int e = jtag_init_reset(context);
        if (e != ERROR_OK) {
-               Jim_SetResult_sprintf(goi.interp, "error: %d", e);
+               Jim_Obj *eObj = Jim_NewIntObj(goi.interp, e);
+               Jim_SetResultFormatted(goi.interp, "error: %#s", eObj);
+               Jim_FreeNewObj(goi.interp, eObj);
                return JIM_ERR;
        }
        return JIM_OK;
 }
 
-static int jim_jtag_newtap(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+int jim_jtag_newtap(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
        Jim_GetOptInfo goi;
        Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
@@ -766,7 +764,7 @@ static int jim_jtag_tap_enabler(Jim_Interp *interp, int argc, Jim_Obj *const *ar
        Jim_GetOptInfo goi;
        Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
        if (goi.argc != 1) {
-               Jim_SetResult_sprintf(goi.interp, "usage: %s <name>", cmd_name);
+               Jim_SetResultFormatted(goi.interp, "usage: %s <name>", cmd_name);
                return JIM_ERR;
        }
 
@@ -779,11 +777,15 @@ static int jim_jtag_tap_enabler(Jim_Interp *interp, int argc, Jim_Obj *const *ar
        if (strcasecmp(cmd_name, "tapisenabled") == 0) {
                // do nothing, just return the value
        } else if (strcasecmp(cmd_name, "tapenable") == 0) {
-               if (!jtag_tap_enable(t))
-                       LOG_WARNING("failed to disable tap");
+               if (!jtag_tap_enable(t)){
+                       LOG_WARNING("failed to enable tap %s", t->dotted_name);
+                        return JIM_ERR;
+                }
        } else if (strcasecmp(cmd_name, "tapdisable") == 0) {
-               if (!jtag_tap_disable(t))
-                       LOG_WARNING("failed to disable tap");
+               if (!jtag_tap_disable(t)){
+                       LOG_WARNING("failed to disable tap %s", t->dotted_name);
+                        return JIM_ERR;
+                }
        } else {
                LOG_ERROR("command '%s' unknown", cmd_name);
                return JIM_ERR;
@@ -861,12 +863,6 @@ static const struct command_registration jtag_subcommand_handlers[] = {
                .handler = handle_jtag_init_command,
                .help = "initialize jtag scan chain",
        },
-       {
-               .name = "interface",
-               .mode = COMMAND_ANY,
-               .jim_handler = jim_jtag_interface,
-               .help = "Returns the name of the currently selected interface.",
-       },
        {
                .name = "arp_init",
                .mode = COMMAND_ANY,
@@ -956,93 +952,6 @@ void jtag_notify_event(enum jtag_event event)
 }
 
 
-static int default_khz(int khz, int *jtag_speed)
-{
-       LOG_ERROR("Translation from khz to jtag_speed not implemented");
-       return ERROR_FAIL;
-}
-
-static int default_speed_div(int speed, int *khz)
-{
-       LOG_ERROR("Translation from jtag_speed to khz not implemented");
-       return ERROR_FAIL;
-}
-
-static int default_power_dropout(int *dropout)
-{
-       *dropout = 0; /* by default we can't detect power dropout */
-       return ERROR_OK;
-}
-
-static int default_srst_asserted(int *srst_asserted)
-{
-       *srst_asserted = 0; /* by default we can't detect srst asserted */
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_interface_list_command)
-{
-       if (strcmp(CMD_NAME, "interface_list") == 0 && CMD_ARGC > 0)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       command_print(CMD_CTX, "The following debug interfaces are available:");
-       for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
-       {
-               const char *name = jtag_interfaces[i]->name;
-               command_print(CMD_CTX, "%u: %s", i + 1, name);
-       }
-
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_interface_command)
-{
-       /* check whether the interface is already configured */
-       if (jtag_interface)
-       {
-               LOG_WARNING("Interface already configured, ignoring");
-               return ERROR_OK;
-       }
-
-       /* interface name is a mandatory argument */
-       if (CMD_ARGC != 1 || CMD_ARGV[0][0] == '\0')
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
-       {
-               if (strcmp(CMD_ARGV[0], jtag_interfaces[i]->name) != 0)
-                       continue;
-
-               if (NULL != jtag_interfaces[i]->commands)
-               {
-                       int retval = register_commands(CMD_CTX, NULL,
-                                       jtag_interfaces[i]->commands);
-                       if (ERROR_OK != retval)
-                               return retval;
-               }
-
-               jtag_interface = jtag_interfaces[i];
-
-               if (jtag_interface->khz == NULL)
-                       jtag_interface->khz = default_khz;
-               if (jtag_interface->speed_div == NULL)
-                       jtag_interface->speed_div = default_speed_div;
-               if (jtag_interface->power_dropout == NULL)
-                       jtag_interface->power_dropout = default_power_dropout;
-               if (jtag_interface->srst_asserted == NULL)
-                       jtag_interface->srst_asserted = default_srst_asserted;
-
-               return ERROR_OK;
-       }
-
-       /* no valid interface was found (i.e. the configuration option,
-        * didn't match one of the compiled-in interfaces
-        */
-       LOG_ERROR("The specified debug interface was not found (%s)", CMD_ARGV[0]);
-       CALL_COMMAND_HANDLER(handle_interface_list_command);
-       return ERROR_JTAG_INVALID_INTERFACE;
-}
-
 COMMAND_HANDLER(handle_scan_chain_command)
 {
        struct jtag_tap *tap;
@@ -1095,217 +1004,6 @@ COMMAND_HANDLER(handle_scan_chain_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_reset_config_command)
-{
-       int new_cfg = 0;
-       int mask = 0;
-
-       /* Original versions cared about the order of these tokens:
-        *   reset_config signals [combination [trst_type [srst_type]]]
-        * They also clobbered the previous configuration even on error.
-        *
-        * Here we don't care about the order, and only change values
-        * which have been explicitly specified.
-        */
-       for (; CMD_ARGC; CMD_ARGC--, CMD_ARGV++) {
-               int tmp = 0;
-               int m;
-
-               /* gating */
-               m = RESET_SRST_NO_GATING;
-               if (strcmp(*CMD_ARGV, "srst_gates_jtag") == 0)
-                       /* default: don't use JTAG while SRST asserted */;
-               else if (strcmp(*CMD_ARGV, "srst_nogate") == 0)
-                       tmp = RESET_SRST_NO_GATING;
-               else
-                       m = 0;
-               if (mask & m) {
-                       LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "gating", *CMD_ARGV);
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-               if (m)
-                       goto next;
-
-               /* signals */
-               m = RESET_HAS_TRST | RESET_HAS_SRST;
-               if (strcmp(*CMD_ARGV, "none") == 0)
-                       tmp = RESET_NONE;
-               else if (strcmp(*CMD_ARGV, "trst_only") == 0)
-                       tmp = RESET_HAS_TRST;
-               else if (strcmp(*CMD_ARGV, "srst_only") == 0)
-                       tmp = RESET_HAS_SRST;
-               else if (strcmp(*CMD_ARGV, "trst_and_srst") == 0)
-                       tmp = RESET_HAS_TRST | RESET_HAS_SRST;
-               else
-                       m = 0;
-               if (mask & m) {
-                       LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "signal", *CMD_ARGV);
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-               if (m)
-                       goto next;
-
-               /* combination (options for broken wiring) */
-               m = RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST;
-               if (strcmp(*CMD_ARGV, "separate") == 0)
-                       /* separate reset lines - default */;
-               else if (strcmp(*CMD_ARGV, "srst_pulls_trst") == 0)
-                       tmp |= RESET_SRST_PULLS_TRST;
-               else if (strcmp(*CMD_ARGV, "trst_pulls_srst") == 0)
-                       tmp |= RESET_TRST_PULLS_SRST;
-               else if (strcmp(*CMD_ARGV, "combined") == 0)
-                       tmp |= RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST;
-               else
-                       m = 0;
-               if (mask & m) {
-                       LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "combination", *CMD_ARGV);
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-               if (m)
-                       goto next;
-
-               /* trst_type (NOP without HAS_TRST) */
-               m = RESET_TRST_OPEN_DRAIN;
-               if (strcmp(*CMD_ARGV, "trst_open_drain") == 0)
-                       tmp |= RESET_TRST_OPEN_DRAIN;
-               else if (strcmp(*CMD_ARGV, "trst_push_pull") == 0)
-                       /* push/pull from adapter - default */;
-               else
-                       m = 0;
-               if (mask & m) {
-                       LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "trst_type", *CMD_ARGV);
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-               if (m)
-                       goto next;
-
-               /* srst_type (NOP without HAS_SRST) */
-               m |= RESET_SRST_PUSH_PULL;
-               if (strcmp(*CMD_ARGV, "srst_push_pull") == 0)
-                       tmp |= RESET_SRST_PUSH_PULL;
-               else if (strcmp(*CMD_ARGV, "srst_open_drain") == 0)
-                       /* open drain from adapter - default */;
-               else
-                       m = 0;
-               if (mask & m) {
-                       LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "srst_type", *CMD_ARGV);
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-               if (m)
-                       goto next;
-
-               /* caller provided nonsense; fail */
-               LOG_ERROR("unknown reset_config flag (%s)", *CMD_ARGV);
-               return ERROR_INVALID_ARGUMENTS;
-
-next:
-               /* Remember the bits which were specified (mask)
-                * and their new values (new_cfg).
-                */
-               mask |= m;
-               new_cfg |= tmp;
-       }
-
-       /* clear previous values of those bits, save new values */
-       if (mask) {
-               int old_cfg = jtag_get_reset_config();
-
-               old_cfg &= ~mask;
-               new_cfg |= old_cfg;
-               jtag_set_reset_config(new_cfg);
-       } else
-               new_cfg = jtag_get_reset_config();
-
-
-       /*
-        * Display the (now-)current reset mode
-        */
-       char *modes[5];
-
-       /* minimal JTAG has neither SRST nor TRST (so that's the default) */
-       switch (new_cfg & (RESET_HAS_TRST | RESET_HAS_SRST)) {
-       case RESET_HAS_SRST:
-               modes[0] = "srst_only";
-               break;
-       case RESET_HAS_TRST:
-               modes[0] = "trst_only";
-               break;
-       case RESET_TRST_AND_SRST:
-               modes[0] = "trst_and_srst";
-               break;
-       default:
-               modes[0] = "none";
-               break;
-       }
-
-       /* normally SRST and TRST are decoupled; but bugs happen ... */
-       switch (new_cfg & (RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST)) {
-       case RESET_SRST_PULLS_TRST:
-               modes[1] = "srst_pulls_trst";
-               break;
-       case RESET_TRST_PULLS_SRST:
-               modes[1] = "trst_pulls_srst";
-               break;
-       case RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST:
-               modes[1] = "combined";
-               break;
-       default:
-               modes[1] = "separate";
-               break;
-       }
-
-       /* TRST-less connectors include Altera, Xilinx, and minimal JTAG */
-       if (new_cfg & RESET_HAS_TRST) {
-               if (new_cfg & RESET_TRST_OPEN_DRAIN)
-                       modes[3] = " trst_open_drain";
-               else
-                       modes[3] = " trst_push_pull";
-       } else
-               modes[3] = "";
-
-       /* SRST-less connectors include TI-14, Xilinx, and minimal JTAG */
-       if (new_cfg & RESET_HAS_SRST) {
-               if (new_cfg & RESET_SRST_NO_GATING)
-                       modes[2] = " srst_nogate";
-               else
-                       modes[2] = " srst_gates_jtag";
-
-               if (new_cfg & RESET_SRST_PUSH_PULL)
-                       modes[4] = " srst_push_pull";
-               else
-                       modes[4] = " srst_open_drain";
-       } else {
-               modes[2] = "";
-               modes[4] = "";
-       }
-
-       command_print(CMD_CTX, "%s %s%s%s%s",
-                       modes[0], modes[1],
-                       modes[2], modes[3], modes[4]);
-
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_adapter_nsrst_delay_command)
-{
-       if (CMD_ARGC > 1)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       if (CMD_ARGC == 1)
-       {
-               unsigned delay;
-               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
-
-               jtag_set_nsrst_delay(delay);
-       }
-       command_print(CMD_CTX, "adapter_nsrst_delay: %u", jtag_get_nsrst_delay());
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(handle_jtag_ntrst_delay_command)
 {
        if (CMD_ARGC > 1)
@@ -1321,21 +1019,6 @@ COMMAND_HANDLER(handle_jtag_ntrst_delay_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command)
-{
-       if (CMD_ARGC > 1)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       if (CMD_ARGC == 1)
-       {
-               unsigned delay;
-               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
-
-               jtag_set_nsrst_assert_width(delay);
-       }
-       command_print(CMD_CTX, "jtag_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(handle_jtag_ntrst_assert_width_command)
 {
        if (CMD_ARGC > 1)
@@ -1351,35 +1034,6 @@ COMMAND_HANDLER(handle_jtag_ntrst_assert_width_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_adapter_khz_command)
-{
-       if (CMD_ARGC > 1)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       int retval = ERROR_OK;
-       if (CMD_ARGC == 1)
-       {
-               unsigned khz = 0;
-               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], khz);
-
-               retval = jtag_config_khz(khz);
-               if (ERROR_OK != retval)
-                       return retval;
-       }
-
-       int cur_speed = jtag_get_speed_khz();
-       retval = jtag_get_speed_readable(&cur_speed);
-       if (ERROR_OK != retval)
-               return retval;
-
-       if (cur_speed)
-               command_print(CMD_CTX, "%d kHz", cur_speed);
-       else
-               command_print(CMD_CTX, "RCLK - adaptive");
-
-       return retval;
-}
-
 COMMAND_HANDLER(handle_jtag_rclk_command)
 {
        if (CMD_ARGC > 1)
@@ -1511,7 +1165,7 @@ COMMAND_HANDLER(handle_irscan_command)
                {
                        int j;
                        for (j = 0; j < i; j++)
-                               free(fields[j].out_value);
+                               free((void *)fields[j].out_value);
                         free(fields);
                        command_print(CMD_CTX, "Tap: %s unknown", CMD_ARGV[i*2]);
 
@@ -1525,7 +1179,8 @@ COMMAND_HANDLER(handle_irscan_command)
                retval = parse_u32(CMD_ARGV[i * 2 + 1], &value);
                if (ERROR_OK != retval)
                        goto error_return;
-               buf_set_u32(fields[i].out_value, 0, field_size, value);
+void *v = (void *)fields[i].out_value;
+               buf_set_u32(v, 0, field_size, value);
                fields[i].in_value = NULL;
        }
 
@@ -1538,7 +1193,7 @@ error_return:
        for (i = 0; i < num_fields; i++)
        {
                if (NULL != fields[i].out_value)
-                       free(fields[i].out_value);
+                       free((void *)fields[i].out_value);
        }
 
        free (fields);
@@ -1607,52 +1262,71 @@ COMMAND_HANDLER(handle_tms_sequence_command)
        return ERROR_OK;
 }
 
-static const struct command_registration interface_command_handlers[] = {
-       {
-               .name = "adapter_khz",
-               .handler = handle_adapter_khz_command,
-               .mode = COMMAND_ANY,
-               .help = "With an argument, change to the specified maximum "
-                       "jtag speed.  For JTAG, 0 KHz signifies adaptive "
-                       " clocking. "
-                       "With or without argument, display current setting.",
-               .usage = "[khz]",
-       },
+COMMAND_HANDLER(handle_jtag_flush_queue_sleep)
+{
+       if (CMD_ARGC != 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       int sleep_ms;
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], sleep_ms);
+
+       jtag_set_flush_queue_sleep(sleep_ms);
+
+       return ERROR_OK;
+}
+
+COMMAND_HANDLER(handle_wait_srst_deassert)
+{
+       if (CMD_ARGC != 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       int timeout_ms;
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], timeout_ms);
+       if ((timeout_ms <= 0) || (timeout_ms > 100000))
        {
-               .name = "adapter_nsrst_delay",
-               .handler = handle_adapter_nsrst_delay_command,
-               .mode = COMMAND_ANY,
-               .help = "delay after deasserting srst in ms",
-               .usage = "[milliseconds]",
-       },
+               LOG_ERROR("Timeout must be an integer between 0 and 100000");
+               return ERROR_FAIL;
+       }
+
+       LOG_USER("Waiting for srst assert + deassert for at most %dms", timeout_ms);
+       int asserted_yet;
+       long long then = timeval_ms();
+       while (jtag_srst_asserted(&asserted_yet) == ERROR_OK)
        {
-               .name = "interface",
-               .handler = handle_interface_command,
-               .mode = COMMAND_CONFIG,
-               .help = "Select a debug adapter interface (driver)",
-               .usage = "driver_name",
-       },
+               if ((timeval_ms() - then) > timeout_ms)
+               {
+                       LOG_ERROR("Timed out");
+                       return ERROR_FAIL;
+               }
+               if (asserted_yet)
+                       break;
+       }
+       while (jtag_srst_asserted(&asserted_yet) == ERROR_OK)
        {
-               .name = "interface_list",
-               .handler = handle_interface_list_command,
-               .mode = COMMAND_ANY,
-               .help = "List all built-in debug adapter interfaces (drivers)",
-       },
-       COMMAND_REGISTRATION_DONE
-};
+               if ((timeval_ms() - then) > timeout_ms)
+               {
+                       LOG_ERROR("Timed out");
+                       return ERROR_FAIL;
+               }
+               if (!asserted_yet)
+                       break;
+       }
 
-/**
- * Register the commands which deal with arbitrary debug adapter drivers.
- *
- * @todo Remove internal assumptions that all debug adapters use JTAG for
- * transport.  Various types and data structures are not named generically.
- */
-int interface_register_commands(struct command_context *ctx)
-{
-       return register_commands(ctx, NULL, interface_command_handlers);
+       return ERROR_OK;
 }
 
+
+
 static const struct command_registration jtag_command_handlers[] = {
+
+       {
+               .name = "jtag_flush_queue_sleep",
+               .handler = handle_jtag_flush_queue_sleep,
+               .mode = COMMAND_ANY,
+               .help = "For debug purposes(simulate long delays of interface) "
+                               "to test performance or change in behavior. Default 0ms.",
+               .usage = "[sleep in ms]",
+       },
        {
                .name = "jtag_rclk",
                .handler = handle_jtag_rclk_command,
@@ -1662,17 +1336,6 @@ static const struct command_registration jtag_command_handlers[] = {
                        "With or without argument, display current setting.",
                .usage = "[fallback_speed_khz]",
        },
-       {
-               .name = "reset_config",
-               .handler = handle_reset_config_command,
-               .mode = COMMAND_ANY,
-               .help = "configure JTAG reset behavior",
-               .usage = "[none|trst_only|srst_only|trst_and_srst] "
-                       "[srst_pulls_trst|trst_pulls_srst|combined|separate] "
-                       "[srst_gates_jtag|srst_nogate] "
-                       "[trst_push_pull|trst_open_drain] "
-                       "[srst_push_pull|srst_open_drain]",
-       },
        {
                .name = "jtag_ntrst_delay",
                .handler = handle_jtag_ntrst_delay_command,
@@ -1680,13 +1343,6 @@ static const struct command_registration jtag_command_handlers[] = {
                .help = "delay after deasserting trst in ms",
                .usage = "[milliseconds]",
        },
-       {
-               .name = "jtag_nsrst_assert_width",
-               .handler = handle_jtag_nsrst_assert_width_command,
-               .mode = COMMAND_ANY,
-               .help = "delay after asserting srst in ms",
-               .usage = "[milliseconds]",
-       },
        {
                .name = "jtag_ntrst_assert_width",
                .handler = handle_jtag_ntrst_assert_width_command,
@@ -1750,6 +1406,15 @@ static const struct command_registration jtag_command_handlers[] = {
                        /* Specifically for working around DRIVER bugs... */
                .usage = "['short'|'long']",
        },
+       {
+               .name = "wait_srst_deassert",
+               .handler = handle_wait_srst_deassert,
+               .mode = COMMAND_ANY,
+               .help = "Wait for an SRST deassert. "
+                       "Useful for cases where you need something to happen within ms "
+                       "of an srst deassert. Timeout in ms ",
+               .usage = "ms",
+       },
        {
                .name = "jtag",
                .mode = COMMAND_ANY,