split jim_newtap_cmd into pieces
[openocd.git] / src / jtag / tcl.c
index 7307f64e3cf49ea695241e28c67a3db2fb058bde..7ec7fa40980fb711b9e408e18508ac9700d64b57 100644 (file)
@@ -51,6 +51,238 @@ static const Jim_Nvp nvp_jtag_tap_event[] = {
 
 extern struct jtag_interface *jtag_interface;
 
+static bool scan_is_safe(tap_state_t state)
+{
+       switch (state)
+       {
+       case TAP_RESET:
+       case TAP_IDLE:
+       case TAP_DRPAUSE:
+       case TAP_IRPAUSE:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
+{
+       int retval;
+       struct scan_field *fields;
+       int num_fields;
+       int field_count = 0;
+       int i, e;
+       struct jtag_tap *tap;
+       tap_state_t endstate;
+
+       /* args[1] = device
+        * args[2] = num_bits
+        * args[3] = hex string
+        * ... repeat num bits and hex string ...
+        *
+        * .. optionally:
+       *     args[N-2] = "-endstate"
+        *     args[N-1] = statename
+        */
+       if ((argc < 4) || ((argc % 2) != 0))
+       {
+               Jim_WrongNumArgs(interp, 1, args, "wrong arguments");
+               return JIM_ERR;
+       }
+
+       endstate = TAP_IDLE;
+
+       script_debug(interp, "drscan", argc, args);
+
+       /* validate arguments as numbers */
+       e = JIM_OK;
+       for (i = 2; i < argc; i += 2)
+       {
+               long bits;
+               const char *cp;
+
+               e = Jim_GetLong(interp, args[i], &bits);
+               /* If valid - try next arg */
+               if (e == JIM_OK) {
+                       continue;
+               }
+
+               /* Not valid.. are we at the end? */
+               if (((i + 2) != argc)) {
+                       /* nope, then error */
+                       return e;
+               }
+
+               /* it could be: "-endstate FOO"
+                * e.g. DRPAUSE so we can issue more instructions
+                * before entering RUN/IDLE and executing them.
+                */
+
+               /* get arg as a string. */
+               cp = Jim_GetString(args[i], NULL);
+               /* is it the magic? */
+               if (0 == strcmp("-endstate", cp)) {
+                       /* is the statename valid? */
+                       cp = Jim_GetString(args[i + 1], NULL);
+
+                       /* see if it is a valid state name */
+                       endstate = tap_state_by_name(cp);
+                       if (endstate < 0) {
+                               /* update the error message */
+                               Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
+                       } else {
+                               if (!scan_is_safe(endstate))
+                                       LOG_WARNING("drscan with unsafe "
+                                                       "endstate \"%s\"", cp);
+
+                               /* valid - so clear the error */
+                               e = JIM_OK;
+                               /* and remove the last 2 args */
+                               argc -= 2;
+                       }
+               }
+
+               /* Still an error? */
+               if (e != JIM_OK) {
+                       return e; /* too bad */
+               }
+       } /* validate args */
+
+       tap = jtag_tap_by_jim_obj(interp, args[1]);
+       if (tap == NULL) {
+               return JIM_ERR;
+       }
+
+       num_fields = (argc-2)/2;
+       fields = malloc(sizeof(struct scan_field) * num_fields);
+       for (i = 2; i < argc; i += 2)
+       {
+               long bits;
+               int len;
+               const char *str;
+
+               Jim_GetLong(interp, args[i], &bits);
+               str = Jim_GetString(args[i + 1], &len);
+
+               fields[field_count].tap = tap;
+               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;
+               field_count++;
+       }
+
+       jtag_add_dr_scan(num_fields, fields, endstate);
+
+       retval = jtag_execute_queue();
+       if (retval != ERROR_OK)
+       {
+               Jim_SetResultString(interp, "drscan: jtag execute failed",-1);
+               return JIM_ERR;
+       }
+
+       field_count = 0;
+       Jim_Obj *list = Jim_NewListObj(interp, NULL, 0);
+       for (i = 2; i < argc; i += 2)
+       {
+               long bits;
+               char *str;
+
+               Jim_GetLong(interp, args[i], &bits);
+               str = buf_to_str(fields[field_count].in_value, bits, 16);
+               free(fields[field_count].out_value);
+
+               Jim_ListAppendElement(interp, list, Jim_NewStringObj(interp, str, strlen(str)));
+               free(str);
+               field_count++;
+       }
+
+       Jim_SetResult(interp, list);
+
+       free(fields);
+
+       return JIM_OK;
+}
+
+
+static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *args)
+{
+       tap_state_t states[8];
+
+       if ((argc < 2) || ((size_t)argc > (ARRAY_SIZE(states) + 1)))
+       {
+               Jim_WrongNumArgs(interp, 1, args, "wrong arguments");
+               return JIM_ERR;
+       }
+
+       script_debug(interp, "pathmove", argc, args);
+
+       int i;
+       for (i = 0; i < argc-1; i++)
+       {
+               const char *cp;
+               cp = Jim_GetString(args[i + 1], NULL);
+               states[i] = tap_state_by_name(cp);
+               if (states[i] < 0)
+               {
+                       /* update the error message */
+                       Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
+                       return JIM_ERR;
+               }
+       }
+
+       if ((jtag_add_statemove(states[0]) != ERROR_OK) || (jtag_execute_queue()!= ERROR_OK))
+       {
+               Jim_SetResultString(interp, "pathmove: jtag execute failed",-1);
+               return JIM_ERR;
+       }
+
+       jtag_add_pathmove(argc-2, states + 1);
+
+       if (jtag_execute_queue()!= ERROR_OK)
+       {
+               Jim_SetResultString(interp, "pathmove: failed",-1);
+               return JIM_ERR;
+       }
+
+       return JIM_OK;
+}
+
+
+static int Jim_Command_flush_count(Jim_Interp *interp, int argc, Jim_Obj *const *args)
+{
+       script_debug(interp, "flush_count", argc, args);
+
+       Jim_SetResult(interp, Jim_NewIntObj(interp, jtag_get_flush_queue_count()));
+
+       return JIM_OK;
+}
+
+static const struct command_registration jtag_command_handlers_to_move[] = {
+       {
+               .name = "drscan",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &Jim_Command_drscan,
+               .help = "execute DR scan <device> "
+                       "<num_bits> <value> <num_bits1> <value2> ...",
+       },
+       {
+               .name = "flush_count",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &Jim_Command_flush_count,
+               .help = "returns number of times the JTAG queue has been flushed",
+       },
+       {
+               .name = "pathmove",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &Jim_Command_pathmove,
+               .usage = "<state1>,<state2>,<state3>... ",
+               .help = "move JTAG to state1 then to state2, state3, etc.",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+
 enum jtag_tap_cfg_param {
        JCFG_EVENT
 };
@@ -61,94 +293,105 @@ static Jim_Nvp nvp_config_opts[] = {
        { .name = NULL,          .value = -1 }
 };
 
-static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, struct jtag_tap * tap)
+static int jtag_tap_configure_event(Jim_GetOptInfo *goi, struct jtag_tap * tap)
 {
+       if (goi->argc == 0)
+       {
+               Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event <event-name> ...");
+               return JIM_ERR;
+       }
+
        Jim_Nvp *n;
-       Jim_Obj *o;
-       int e;
+       int e = Jim_GetOpt_Nvp(goi, nvp_jtag_tap_event, &n);
+       if (e != JIM_OK)
+       {
+               Jim_GetOpt_NvpUnknown(goi, nvp_jtag_tap_event, 1);
+               return e;
+       }
+
+       if (goi->isconfigure) {
+               if (goi->argc != 1) {
+                       Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event <event-name> <event-body>");
+                       return JIM_ERR;
+               }
+       } else {
+               if (goi->argc != 0) {
+                       Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event <event-name>");
+                       return JIM_ERR;
+               }
+       }
+
+       struct jtag_tap_event_action *jteap  = tap->event_action;
+       /* replace existing event body */
+       bool found = false;
+       while (jteap)
+       {
+               if (jteap->event == (enum jtag_event)n->value)
+               {
+                       found = true;
+                       break;
+               }
+               jteap = jteap->next;
+       }
+
+       Jim_SetEmptyResult(goi->interp);
+
+       if (goi->isconfigure)
+       {
+               if (!found)
+                       jteap = calloc(1, sizeof(*jteap));
+               else if (NULL != jteap->body)
+                       Jim_DecrRefCount(interp, jteap->body);
 
+               jteap->event = n->value;
+
+               Jim_Obj *o;
+               Jim_GetOpt_Obj(goi, &o);
+               jteap->body = Jim_DuplicateObj(goi->interp, o);
+               Jim_IncrRefCount(jteap->body);
+
+               if (!found)
+               {
+                       /* add to head of event list */
+                       jteap->next = tap->event_action;
+                       tap->event_action = jteap;
+               }
+       }
+       else if (found)
+       {
+               Jim_SetResult(goi->interp,
+                       Jim_DuplicateObj(goi->interp, jteap->body));
+       }
+       return JIM_OK;
+}
+
+static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, struct jtag_tap * tap)
+{
        /* parse config or cget options */
-       while (goi->argc > 0) {
+       while (goi->argc > 0)
+       {
                Jim_SetEmptyResult (goi->interp);
 
-               e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n);
-               if (e != JIM_OK) {
+               Jim_Nvp *n;
+               int e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n);
+               if (e != JIM_OK)
+               {
                        Jim_GetOpt_NvpUnknown(goi, nvp_config_opts, 0);
                        return e;
                }
 
-               switch (n->value) {
-                       case JCFG_EVENT:
-                               if (goi->argc == 0) {
-                                       Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
-                                       return JIM_ERR;
-                               }
-
-                               e = Jim_GetOpt_Nvp(goi, nvp_jtag_tap_event, &n);
-                               if (e != JIM_OK) {
-                                       Jim_GetOpt_NvpUnknown(goi, nvp_jtag_tap_event, 1);
-                                       return e;
-                               }
-
-                               if (goi->isconfigure) {
-                                       if (goi->argc != 1) {
-                                               Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
-                                               return JIM_ERR;
-                                       }
-                               } else {
-                                       if (goi->argc != 0) {
-                                               Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name?");
-                                               return JIM_ERR;
-                                       }
-                               }
-
-                               {
-                                       struct jtag_tap_event_action *jteap;
-
-                                       jteap = tap->event_action;
-                                       /* replace existing? */
-                                       while (jteap) {
-                                               if (jteap->event == (enum jtag_event)n->value) {
-                                                       break;
-                                               }
-                                               jteap = jteap->next;
-                                       }
-
-                                       if (goi->isconfigure) {
-                                               bool replace = true;
-                                               if (jteap == NULL) {
-                                                       /* create new */
-                                                       jteap = calloc(1, sizeof (*jteap));
-                                                       replace = false;
-                                               }
-                                               jteap->event = n->value;
-                                               Jim_GetOpt_Obj(goi, &o);
-                                               if (jteap->body) {
-                                                       Jim_DecrRefCount(interp, jteap->body);
-                                               }
-                                               jteap->body = Jim_DuplicateObj(goi->interp, o);
-                                               Jim_IncrRefCount(jteap->body);
-
-                                               if (!replace)
-                                               {
-                                                       /* add to head of event list */
-                                                       jteap->next = tap->event_action;
-                                                       tap->event_action = jteap;
-                                               }
-                                               Jim_SetEmptyResult(goi->interp);
-                                       } else {
-                                               /* get */
-                                               if (jteap == NULL) {
-                                                       Jim_SetEmptyResult(goi->interp);
-                                               } else {
-                                                       Jim_SetResult(goi->interp, Jim_DuplicateObj(goi->interp, jteap->body));
-                                               }
-                                       }
-                               }
-                               /* loop for more */
-                               break;
+               switch (n->value)
+               {
+               case JCFG_EVENT:
+                       e = jtag_tap_configure_event(goi, tap);
+                       if (e != JIM_OK)
+                               return e;
+                       break;
+               default:
+                       Jim_SetResult_sprintf(goi->interp, "unknown event: %s", n->name);
+                       return JIM_ERR;
                }
-       } /* while (goi->argc) */
+       }
 
        return JIM_OK;
 }
@@ -163,26 +406,106 @@ static int is_bad_irval(int ir_length, jim_wide w)
        return (w & v) != 0;
 }
 
+static int jim_newtap_expected_id(Jim_Nvp *n, Jim_GetOptInfo *goi,
+               struct jtag_tap *pTap)
+{
+       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);
+               return e;
+       }
+
+       unsigned expected_len = sizeof(uint32_t) * pTap->expected_ids_cnt;
+       uint32_t *new_expected_ids = malloc(expected_len + sizeof(uint32_t));
+       if (new_expected_ids == NULL)
+       {
+               Jim_SetResult_sprintf(goi->interp, "no memory");
+               return JIM_ERR;
+       }
+
+       memcpy(new_expected_ids, pTap->expected_ids, expected_len);
+
+       new_expected_ids[pTap->expected_ids_cnt] = w;
+
+       free(pTap->expected_ids);
+       pTap->expected_ids = new_expected_ids;
+       pTap->expected_ids_cnt++;
+
+       return JIM_OK;
+}
+
+#define NTAP_OPT_IRLEN     0
+#define NTAP_OPT_IRMASK    1
+#define NTAP_OPT_IRCAPTURE 2
+#define NTAP_OPT_ENABLED   3
+#define NTAP_OPT_DISABLED  4
+#define NTAP_OPT_EXPECTED_ID 5
+
+static int jim_newtap_ir_param(Jim_Nvp *n, Jim_GetOptInfo *goi,
+               struct jtag_tap *pTap)
+{
+       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);
+               free((void *)pTap->dotted_name);
+               return e;
+       }
+       switch (n->value) {
+       case NTAP_OPT_IRLEN:
+               if (w > (jim_wide) (8 * sizeof(pTap->ir_capture_value)))
+               {
+                       LOG_WARNING("%s: huge IR length %d",
+                                       pTap->dotted_name, (int) w);
+               }
+               pTap->ir_length = w;
+               break;
+       case NTAP_OPT_IRMASK:
+               if (is_bad_irval(pTap->ir_length, w))
+               {
+                       LOG_ERROR("%s: IR mask %x too big",
+                                       pTap->dotted_name,
+                                       (int) w);
+                       return JIM_ERR;
+               }
+               if ((w & 3) != 3)
+                       LOG_WARNING("%s: nonstandard IR mask", pTap->dotted_name);
+               pTap->ir_capture_mask = w;
+               break;
+       case NTAP_OPT_IRCAPTURE:
+               if (is_bad_irval(pTap->ir_length, w))
+               {
+                       LOG_ERROR("%s: IR capture %x too big",
+                                       pTap->dotted_name, (int) w);
+                       return JIM_ERR;
+               }
+               if ((w & 3) != 1)
+                       LOG_WARNING("%s: nonstandard IR value",
+                                       pTap->dotted_name);
+               pTap->ir_capture_value = w;
+               break;
+       default:
+               return JIM_ERR;
+       }
+       return JIM_OK;
+}
+
 static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 {
        struct jtag_tap *pTap;
-       jim_wide w;
        int x;
        int e;
        Jim_Nvp *n;
        char *cp;
        const Jim_Nvp opts[] = {
-#define NTAP_OPT_IRLEN     0
                { .name = "-irlen"                      ,       .value = NTAP_OPT_IRLEN },
-#define NTAP_OPT_IRMASK    1
                { .name = "-irmask"                     ,       .value = NTAP_OPT_IRMASK },
-#define NTAP_OPT_IRCAPTURE 2
                { .name = "-ircapture"          ,       .value = NTAP_OPT_IRCAPTURE },
-#define NTAP_OPT_ENABLED   3
                { .name = "-enable"                     ,       .value = NTAP_OPT_ENABLED },
-#define NTAP_OPT_DISABLED  4
                { .name = "-disable"            ,       .value = NTAP_OPT_DISABLED },
-#define NTAP_OPT_EXPECTED_ID 5
                { .name = "-expected-id"        ,       .value = NTAP_OPT_EXPECTED_ID },
                { .name = NULL                          ,       .value = -1 },
        };
@@ -240,81 +563,25 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                        pTap->disabled_after_reset = true;
                        break;
                case NTAP_OPT_EXPECTED_ID:
-               {
-                       uint32_t *new_expected_ids;
-
-                       e = Jim_GetOpt_Wide(goi, &w);
-                       if (e != JIM_OK) {
-                               Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+                       e = jim_newtap_expected_id(n, goi, pTap);
+                       if (JIM_OK != e)
+                       {
                                free((void *)pTap->dotted_name);
                                free(pTap);
                                return e;
                        }
-
-                       new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1));
-                       if (new_expected_ids == NULL) {
-                               Jim_SetResult_sprintf(goi->interp, "no memory");
-                               free((void *)pTap->dotted_name);
-                               free(pTap);
-                               return JIM_ERR;
-                       }
-
-                       memcpy(new_expected_ids, pTap->expected_ids, sizeof(uint32_t) * pTap->expected_ids_cnt);
-
-                       new_expected_ids[pTap->expected_ids_cnt] = w;
-
-                       free(pTap->expected_ids);
-                       pTap->expected_ids = new_expected_ids;
-                       pTap->expected_ids_cnt++;
                        break;
-               }
                case NTAP_OPT_IRLEN:
                case NTAP_OPT_IRMASK:
                case NTAP_OPT_IRCAPTURE:
-                       e = Jim_GetOpt_Wide(goi, &w);
-                       if (e != JIM_OK) {
-                               Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+                       e = jim_newtap_ir_param(n, goi, pTap);
+                       if (JIM_OK != e)
+                       {
                                free((void *)pTap->dotted_name);
                                free(pTap);
                                return e;
                        }
-                       switch (n->value) {
-                       case NTAP_OPT_IRLEN:
-                               if (w > (jim_wide) (8 * sizeof(pTap->ir_capture_value)))
-                                       LOG_WARNING("%s: huge IR length %d",
-                                                       pTap->dotted_name,
-                                                       (int) w);
-                               pTap->ir_length = w;
-                               break;
-                       case NTAP_OPT_IRMASK:
-                               if (is_bad_irval(pTap->ir_length, w)) {
-                                       LOG_ERROR("%s: IR mask %x too big",
-                                                       pTap->dotted_name,
-                                                       (int) w);
-                                       free((void *)pTap->dotted_name);
-                                       free(pTap);
-                                       return ERROR_FAIL;
-                               }
-                               if ((w & 3) != 3)
-                                       LOG_WARNING("%s: nonstandard IR mask",
-                                                       pTap->dotted_name);
-                               pTap->ir_capture_mask = w;
-                               break;
-                       case NTAP_OPT_IRCAPTURE:
-                               if (is_bad_irval(pTap->ir_length, w)) {
-                                       LOG_ERROR("%s: IR capture %x too big",
-                                                       pTap->dotted_name,
-                                                       (int) w);
-                                       free((void *)pTap->dotted_name);
-                                       free(pTap);
-                                       return ERROR_FAIL;
-                               }
-                               if ((w & 3) != 1)
-                                       LOG_WARNING("%s: nonstandard IR value",
-                                                       pTap->dotted_name);
-                               pTap->ir_capture_value = w;
-                               break;
-                       }
+                       break;
                } /* switch (n->value) */
        } /* while (goi->argc) */
 
@@ -339,236 +606,277 @@ static void jtag_tap_handle_event(struct jtag_tap *tap, enum jtag_event e)
 {
        struct jtag_tap_event_action * jteap;
 
-       for (jteap = tap->event_action; jteap != NULL; jteap = jteap->next) {
-               if (jteap->event == e) {
-                       LOG_DEBUG("JTAG tap: %s event: %d (%s)\n\taction: %s",
-                                       tap->dotted_name,
-                                       e,
-                                       Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name,
-                                       Jim_GetString(jteap->body, NULL));
-                       if (Jim_EvalObj(interp, jteap->body) != JIM_OK) {
-                               Jim_PrintErrorMessage(interp);
-                       } else switch (e) {
-                       case JTAG_TAP_EVENT_ENABLE:
-                       case JTAG_TAP_EVENT_DISABLE:
-                               /* NOTE:  we currently assume the handlers
-                                * can't fail.  Right here is where we should
-                                * really be verifying the scan chains ...
-                                */
-                               tap->enabled = (e == JTAG_TAP_EVENT_ENABLE);
-                               LOG_INFO("JTAG tap: %s %s", tap->dotted_name,
-                                       tap->enabled ? "enabled" : "disabled");
-                               break;
-                       default:
-                               break;
-                       }
+       for (jteap = tap->event_action; jteap != NULL; jteap = jteap->next)
+       {
+               if (jteap->event != e)
+                       continue;
+
+               Jim_Nvp *nvp = Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e);
+               LOG_DEBUG("JTAG tap: %s event: %d (%s)\n\taction: %s",
+                               tap->dotted_name, e, nvp->name,
+                               Jim_GetString(jteap->body, NULL));
+
+               if (Jim_EvalObj(interp, jteap->body) != JIM_OK)
+               {
+                       Jim_PrintErrorMessage(interp);
+                       continue;
+               }
+
+               switch (e)
+               {
+               case JTAG_TAP_EVENT_ENABLE:
+               case JTAG_TAP_EVENT_DISABLE:
+                       /* NOTE:  we currently assume the handlers
+                        * can't fail.  Right here is where we should
+                        * really be verifying the scan chains ...
+                        */
+                       tap->enabled = (e == JTAG_TAP_EVENT_ENABLE);
+                       LOG_INFO("JTAG tap: %s %s", tap->dotted_name,
+                               tap->enabled ? "enabled" : "disabled");
+                       break;
+               default:
+                       break;
                }
        }
 }
 
-
-static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static int jim_jtag_interface(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
        Jim_GetOptInfo goi;
-       int e;
-       Jim_Nvp *n;
-       Jim_Obj *o;
-       struct command_context *context;
-
-       enum {
-               JTAG_CMD_INTERFACE,
-               JTAG_CMD_INIT,
-               JTAG_CMD_INIT_RESET,
-               JTAG_CMD_NEWTAP,
-               JTAG_CMD_TAPENABLE,
-               JTAG_CMD_TAPDISABLE,
-               JTAG_CMD_TAPISENABLED,
-               JTAG_CMD_CONFIGURE,
-               JTAG_CMD_CGET,
-               JTAG_CMD_NAMES,
-       };
+       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
 
-       const Jim_Nvp jtag_cmds[] = {
-               { .name = "interface"     , .value = JTAG_CMD_INTERFACE },
-               { .name = "arp_init"      , .value = JTAG_CMD_INIT },
-               { .name = "arp_init-reset", .value = JTAG_CMD_INIT_RESET },
-               { .name = "newtap"        , .value = JTAG_CMD_NEWTAP },
-               { .name = "tapisenabled"     , .value = JTAG_CMD_TAPISENABLED },
-               { .name = "tapenable"     , .value = JTAG_CMD_TAPENABLE },
-               { .name = "tapdisable"    , .value = JTAG_CMD_TAPDISABLE },
-               { .name = "configure"     , .value = JTAG_CMD_CONFIGURE },
-               { .name = "cget"          , .value = JTAG_CMD_CGET },
-               { .name = "names"         , .value = JTAG_CMD_NAMES },
-
-               { .name = NULL, .value = -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;
+}
 
-       context = Jim_GetAssocData(interp, "context");
-       /* go past the command */
+static int jim_jtag_arp_init(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
        Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+       if (goi.argc != 0) {
+               Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
+               return JIM_ERR;
+       }
+       struct command_context *context = Jim_GetAssocData(interp, "context");
+       int e = jtag_init_inner(context);
+       if (e != ERROR_OK) {
+               Jim_SetResult_sprintf(goi.interp, "error: %d", e);
+               return JIM_ERR;
+       }
+       return JIM_OK;
+}
 
-       e = Jim_GetOpt_Nvp(&goi, jtag_cmds, &n);
-       if (e != JIM_OK) {
-               Jim_GetOpt_NvpUnknown(&goi, jtag_cmds, 0);
-               return e;
+static int jim_jtag_arp_init_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+       if (goi.argc != 0) {
+               Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
+               return JIM_ERR;
        }
-               Jim_SetEmptyResult(goi.interp);
-       switch (n->value) {
-       case JTAG_CMD_INTERFACE:
-               /* 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;
-       case JTAG_CMD_INIT:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
-                       return JIM_ERR;
-               }
-               e = jtag_init_inner(context);
-               if (e != ERROR_OK) {
-                       Jim_SetResult_sprintf(goi.interp, "error: %d", e);
-                       return JIM_ERR;
-               }
-               return JIM_OK;
-       case JTAG_CMD_INIT_RESET:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
-                       return JIM_ERR;
-               }
-               e = jtag_init_reset(context);
-               if (e != ERROR_OK) {
-                       Jim_SetResult_sprintf(goi.interp, "error: %d", e);
-                       return JIM_ERR;
-               }
-               return JIM_OK;
-       case JTAG_CMD_NEWTAP:
-               return jim_newtap_cmd(&goi);
-               break;
-       case JTAG_CMD_TAPISENABLED:
-       case JTAG_CMD_TAPENABLE:
-       case JTAG_CMD_TAPDISABLE:
-               if (goi.argc != 1) {
-                       Jim_SetResultString(goi.interp, "Too many parameters",-1);
-                       return JIM_ERR;
-               }
+       struct command_context *context = Jim_GetAssocData(interp, "context");
+       int e = jtag_init_reset(context);
+       if (e != ERROR_OK) {
+               Jim_SetResult_sprintf(goi.interp, "error: %d", e);
+               return JIM_ERR;
+       }
+       return JIM_OK;
+}
 
-               {
-                       struct jtag_tap *t;
-
-                       t = jtag_tap_by_jim_obj(goi.interp, goi.argv[0]);
-                       if (t == NULL)
-                               return JIM_ERR;
-
-                       switch (n->value) {
-                       case JTAG_CMD_TAPISENABLED:
-                               break;
-                       case JTAG_CMD_TAPENABLE:
-                               if (t->enabled)
-                                       break;
-                               jtag_tap_handle_event(t, JTAG_TAP_EVENT_ENABLE);
-                               if (!t->enabled)
-                                       break;
-
-                               /* FIXME add JTAG sanity checks, w/o TLR
-                                *  - scan chain length grew by one (this)
-                                *  - IDs and IR lengths are as expected
-                                */
-
-                               jtag_call_event_callbacks(JTAG_TAP_EVENT_ENABLE);
-                               break;
-                       case JTAG_CMD_TAPDISABLE:
-                               if (!t->enabled)
-                                       break;
-                               jtag_tap_handle_event(t, JTAG_TAP_EVENT_DISABLE);
-                               if (t->enabled)
-                                       break;
-
-                               /* FIXME add JTAG sanity checks, w/o TLR
-                                *  - scan chain length shrank by one (this)
-                                *  - IDs and IR lengths are as expected
-                                */
-
-                               jtag_call_event_callbacks(JTAG_TAP_EVENT_DISABLE);
-                               break;
-                       }
-                       e = t->enabled;
-                       Jim_SetResult(goi.interp, Jim_NewIntObj(goi.interp, e));
-                       return JIM_OK;
-               }
-               break;
+static 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);
+       return jim_newtap_cmd(&goi);
+}
 
-       case JTAG_CMD_CGET:
-               if (goi.argc < 2) {
-                       Jim_WrongNumArgs(goi.interp, 0, NULL,
-                                       "cget tap_name queryparm");
-                       return JIM_ERR;
-               }
+static bool jtag_tap_enable(struct jtag_tap *t)
+{
+       if (t->enabled)
+               return false;
+       jtag_tap_handle_event(t, JTAG_TAP_EVENT_ENABLE);
+       if (!t->enabled)
+               return false;
 
-               {
-                       struct jtag_tap *t;
+       /* FIXME add JTAG sanity checks, w/o TLR
+        *  - scan chain length grew by one (this)
+        *  - IDs and IR lengths are as expected
+        */
+       jtag_call_event_callbacks(JTAG_TAP_EVENT_ENABLE);
+       return true;
+}
+static bool jtag_tap_disable(struct jtag_tap *t)
+{
+       if (!t->enabled)
+               return false;
+       jtag_tap_handle_event(t, JTAG_TAP_EVENT_DISABLE);
+       if (t->enabled)
+               return false;
 
-                       Jim_GetOpt_Obj(&goi, &o);
-                       t = jtag_tap_by_jim_obj(goi.interp, o);
-                       if (t == NULL) {
-                               return JIM_ERR;
-                       }
+       /* FIXME add JTAG sanity checks, w/o TLR
+        *  - scan chain length shrank by one (this)
+        *  - IDs and IR lengths are as expected
+        */
+       jtag_call_event_callbacks(JTAG_TAP_EVENT_DISABLE);
+       return true;
+}
 
-                       goi.isconfigure = 0;
-                       return jtag_tap_configure_cmd(&goi, t);
-               }
-               break;
+static int jim_jtag_tap_enabler(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       const char *cmd_name = Jim_GetString(argv[0], NULL);
+       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);
+               return JIM_ERR;
+       }
 
-       case JTAG_CMD_CONFIGURE:
-               if (goi.argc < 3) {
-                       Jim_WrongNumArgs(goi.interp, 0, NULL,
-                                       "configure tap_name attribute value ...");
-                       return JIM_ERR;
-               }
+       struct jtag_tap *t;
 
-               {
-                       struct jtag_tap *t;
+       t = jtag_tap_by_jim_obj(goi.interp, goi.argv[0]);
+       if (t == NULL)
+               return JIM_ERR;
 
-                       Jim_GetOpt_Obj(&goi, &o);
-                       t = jtag_tap_by_jim_obj(goi.interp, o);
-                       if (t == NULL) {
-                               return JIM_ERR;
-                       }
+       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");
+       } else if (strcasecmp(cmd_name, "tapdisable") == 0) {
+               if (!jtag_tap_disable(t))
+                       LOG_WARNING("failed to disable tap");
+       } else {
+               LOG_ERROR("command '%s' unknown", cmd_name);
+               return JIM_ERR;
+       }
+       bool e = t->enabled;
+       Jim_SetResult(goi.interp, Jim_NewIntObj(goi.interp, e));
+       return JIM_OK;
+}
 
-                       goi.isconfigure = 1;
-                       return jtag_tap_configure_cmd(&goi, t);
-               }
-               break;
+static int jim_jtag_configure(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       const char *cmd_name = Jim_GetString(argv[0], NULL);
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+       goi.isconfigure = !strcmp(cmd_name, "configure");
+       if (goi.argc < 2 + goi.isconfigure) {
+               Jim_WrongNumArgs(goi.interp, 0, NULL,
+                               "<tap_name> <attribute> ...");
+               return JIM_ERR;
+       }
 
-       case JTAG_CMD_NAMES:
-               if (goi.argc != 0) {
-                       Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
-                       return JIM_ERR;
-               }
-               Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
-               {
-                       struct jtag_tap *tap;
+       struct jtag_tap *t;
+
+       Jim_Obj *o;
+       Jim_GetOpt_Obj(&goi, &o);
+       t = jtag_tap_by_jim_obj(goi.interp, o);
+       if (t == NULL) {
+               return JIM_ERR;
+       }
 
-                       for (tap = jtag_all_taps(); tap; tap = tap->next_tap) {
-                               Jim_ListAppendElement(goi.interp,
-                                       Jim_GetResult(goi.interp),
-                                       Jim_NewStringObj(goi.interp,
-                                               tap->dotted_name, -1));
-                       }
-                       return JIM_OK;
-               }
-               break;
+       return jtag_tap_configure_cmd(&goi, t);
+}
 
+static int jim_jtag_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       Jim_GetOptInfo goi;
+       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+       if (goi.argc != 0) {
+               Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
+               return JIM_ERR;
        }
+       Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
+       struct jtag_tap *tap;
 
-       return JIM_ERR;
+       for (tap = jtag_all_taps(); tap; tap = tap->next_tap) {
+               Jim_ListAppendElement(goi.interp,
+                       Jim_GetResult(goi.interp),
+                       Jim_NewStringObj(goi.interp,
+                               tap->dotted_name, -1));
+       }
+       return JIM_OK;
 }
 
+static const struct command_registration jtag_subcommand_handlers[] = {
+       {
+               .name = "interface",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_jtag_interface,
+               .help = "Returns the selected interface",
+       },
+       {
+               .name = "arp_init",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_jtag_arp_init,
+       },
+       {
+               .name = "arp_init-reset",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_jtag_arp_init_reset,
+       },
+       {
+               .name = "newtap",
+               .mode = COMMAND_CONFIG,
+               .jim_handler = &jim_jtag_newtap,
+               .help = "Create a new TAP instance",
+               .usage = "<name> <type> -irlen <count> [-ircapture <count>] "
+                       "[-irmask <count>] [-enable|-disable]",
+       },
+       {
+               .name = "tapisenabled",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_jtag_tap_enabler,
+               .help = "Returns a integer indicating TAP state (0/1)",
+               .usage = "<name>",
+       },
+       {
+               .name = "tapenable",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_jtag_tap_enabler,
+               .help = "Enable the specified TAP",
+               .usage = "<name>",
+       },
+       {
+               .name = "tapdisable",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_jtag_tap_enabler,
+               .help = "Enable the specified TAP",
+               .usage = "<name>",
+       },
+       {
+               .name = "configure",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_jtag_configure,
+               .help = "Enable the specified TAP",
+               .usage = "<name> [<key> <value> ...]",
+       },
+       {
+               .name = "cget",
+               .mode = COMMAND_EXEC,
+               .jim_handler = &jim_jtag_configure,
+               .help = "Enable the specified TAP",
+               .usage = "<name> [<key> <value> ...]",
+       },
+       {
+               .name = "names",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_jtag_names,
+               .help = "Returns list of all JTAG tap names",
+       },
+       {
+               .chain = jtag_command_handlers_to_move,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 void jtag_notify_event(enum jtag_event event)
 {
@@ -636,9 +944,10 @@ COMMAND_HANDLER(handle_interface_command)
                if (strcmp(CMD_ARGV[0], jtag_interfaces[i]->name) != 0)
                        continue;
 
-               if (NULL != jtag_interfaces[i]->register_commands)
+               if (NULL != jtag_interfaces[i]->commands)
                {
-                       int retval = jtag_interfaces[i]->register_commands(CMD_CTX);
+                       int retval = register_commands(CMD_CTX, NULL,
+                                       jtag_interfaces[i]->commands);
                        if (ERROR_OK != retval)
                                return retval;
                }
@@ -1063,20 +1372,6 @@ COMMAND_HANDLER(handle_runtest_command)
  * Not surprisingly, this is the same constraint as SVF; the "irscan"
  * and "drscan" commands are a write-only subset of what SVF provides.
  */
-static bool scan_is_safe(tap_state_t state)
-{
-       switch (state)
-       {
-       case TAP_RESET:
-       case TAP_IDLE:
-       case TAP_DRPAUSE:
-       case TAP_IRPAUSE:
-               return true;
-       default:
-               return false;
-       }
-}
-
 
 COMMAND_HANDLER(handle_irscan_command)
 {
@@ -1159,199 +1454,6 @@ error_return:
        return retval;
 }
 
-static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
-{
-       int retval;
-       struct scan_field *fields;
-       int num_fields;
-       int field_count = 0;
-       int i, e;
-       struct jtag_tap *tap;
-       tap_state_t endstate;
-
-       /* args[1] = device
-        * args[2] = num_bits
-        * args[3] = hex string
-        * ... repeat num bits and hex string ...
-        *
-        * .. optionally:
-       *     args[N-2] = "-endstate"
-        *     args[N-1] = statename
-        */
-       if ((argc < 4) || ((argc % 2) != 0))
-       {
-               Jim_WrongNumArgs(interp, 1, args, "wrong arguments");
-               return JIM_ERR;
-       }
-
-       endstate = TAP_IDLE;
-
-       script_debug(interp, "drscan", argc, args);
-
-       /* validate arguments as numbers */
-       e = JIM_OK;
-       for (i = 2; i < argc; i += 2)
-       {
-               long bits;
-               const char *cp;
-
-               e = Jim_GetLong(interp, args[i], &bits);
-               /* If valid - try next arg */
-               if (e == JIM_OK) {
-                       continue;
-               }
-
-               /* Not valid.. are we at the end? */
-               if (((i + 2) != argc)) {
-                       /* nope, then error */
-                       return e;
-               }
-
-               /* it could be: "-endstate FOO"
-                * e.g. DRPAUSE so we can issue more instructions
-                * before entering RUN/IDLE and executing them.
-                */
-
-               /* get arg as a string. */
-               cp = Jim_GetString(args[i], NULL);
-               /* is it the magic? */
-               if (0 == strcmp("-endstate", cp)) {
-                       /* is the statename valid? */
-                       cp = Jim_GetString(args[i + 1], NULL);
-
-                       /* see if it is a valid state name */
-                       endstate = tap_state_by_name(cp);
-                       if (endstate < 0) {
-                               /* update the error message */
-                               Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
-                       } else {
-                               if (!scan_is_safe(endstate))
-                                       LOG_WARNING("drscan with unsafe "
-                                                       "endstate \"%s\"", cp);
-
-                               /* valid - so clear the error */
-                               e = JIM_OK;
-                               /* and remove the last 2 args */
-                               argc -= 2;
-                       }
-               }
-
-               /* Still an error? */
-               if (e != JIM_OK) {
-                       return e; /* too bad */
-               }
-       } /* validate args */
-
-       tap = jtag_tap_by_jim_obj(interp, args[1]);
-       if (tap == NULL) {
-               return JIM_ERR;
-       }
-
-       num_fields = (argc-2)/2;
-       fields = malloc(sizeof(struct scan_field) * num_fields);
-       for (i = 2; i < argc; i += 2)
-       {
-               long bits;
-               int len;
-               const char *str;
-
-               Jim_GetLong(interp, args[i], &bits);
-               str = Jim_GetString(args[i + 1], &len);
-
-               fields[field_count].tap = tap;
-               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;
-               field_count++;
-       }
-
-       jtag_add_dr_scan(num_fields, fields, endstate);
-
-       retval = jtag_execute_queue();
-       if (retval != ERROR_OK)
-       {
-               Jim_SetResultString(interp, "drscan: jtag execute failed",-1);
-               return JIM_ERR;
-       }
-
-       field_count = 0;
-       Jim_Obj *list = Jim_NewListObj(interp, NULL, 0);
-       for (i = 2; i < argc; i += 2)
-       {
-               long bits;
-               char *str;
-
-               Jim_GetLong(interp, args[i], &bits);
-               str = buf_to_str(fields[field_count].in_value, bits, 16);
-               free(fields[field_count].out_value);
-
-               Jim_ListAppendElement(interp, list, Jim_NewStringObj(interp, str, strlen(str)));
-               free(str);
-               field_count++;
-       }
-
-       Jim_SetResult(interp, list);
-
-       free(fields);
-
-       return JIM_OK;
-}
-
-
-static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *args)
-{
-       tap_state_t states[8];
-
-       if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states) + 1)))
-       {
-               Jim_WrongNumArgs(interp, 1, args, "wrong arguments");
-               return JIM_ERR;
-       }
-
-       script_debug(interp, "pathmove", argc, args);
-
-       int i;
-       for (i = 0; i < argc-1; i++)
-       {
-               const char *cp;
-               cp = Jim_GetString(args[i + 1], NULL);
-               states[i] = tap_state_by_name(cp);
-               if (states[i] < 0)
-               {
-                       /* update the error message */
-                       Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
-                       return JIM_ERR;
-               }
-       }
-
-       if ((jtag_add_statemove(states[0]) != ERROR_OK) || (jtag_execute_queue()!= ERROR_OK))
-       {
-               Jim_SetResultString(interp, "pathmove: jtag execute failed",-1);
-               return JIM_ERR;
-       }
-
-       jtag_add_pathmove(argc-2, states + 1);
-
-       if (jtag_execute_queue()!= ERROR_OK)
-       {
-               Jim_SetResultString(interp, "pathmove: failed",-1);
-               return JIM_ERR;
-       }
-
-       return JIM_OK;
-}
-
-
-static int Jim_Command_flush_count(Jim_Interp *interp, int argc, Jim_Obj *const *args)
-{
-       script_debug(interp, "flush_count", argc, args);
-
-       Jim_SetResult(interp, Jim_NewIntObj(interp, jtag_get_flush_queue_count()));
-
-       return JIM_OK;
-}
-
 
 COMMAND_HANDLER(handle_verify_ircapture_command)
 {
@@ -1413,89 +1515,134 @@ COMMAND_HANDLER(handle_tms_sequence_command)
        return ERROR_OK;
 }
 
-int jtag_register_commands(struct command_context *cmd_ctx)
-{
-       register_jim(cmd_ctx, "jtag", jim_jtag_command,
-                       "perform jtag tap actions");
-
-       register_command(cmd_ctx, NULL, "interface",
-                       handle_interface_command, COMMAND_CONFIG,
-                       "try to configure interface");
-       register_command(cmd_ctx, NULL, "interface_list",
-                       &handle_interface_list_command, COMMAND_ANY,
-                       "list all built-in interfaces");
-
-       register_command(cmd_ctx, NULL, "jtag_khz",
-                       handle_jtag_khz_command, COMMAND_ANY,
-                       "set maximum jtag speed (if supported); "
-                       "parameter is maximum khz, or 0 for adaptive clocking (RTCK).");
-       register_command(cmd_ctx, NULL, "jtag_rclk",
-                       handle_jtag_rclk_command, COMMAND_ANY,
-                       "fallback_speed_khz - set JTAG speed to RCLK or use fallback speed");
-       register_command(cmd_ctx, NULL, "reset_config",
-                       handle_reset_config_command, COMMAND_ANY,
-                       "reset_config "
-                       "[none|trst_only|srst_only|trst_and_srst] "
+static const struct command_registration jtag_command_handlers[] = {
+       {
+               .name = "interface",
+               .handler = &handle_interface_command,
+               .mode = COMMAND_CONFIG,
+               .help = "select a JTAG interface",
+               .usage = "<driver_name>",
+       },
+       {
+               .name = "interface_list",
+               .handler = &handle_interface_list_command,
+               .mode = COMMAND_ANY,
+               .help = "list all built-in interfaces",
+       },
+       {
+               .name = "jtag_khz",
+               .handler = &handle_jtag_khz_command,
+               .mode = COMMAND_ANY,
+               .help = "set maximum jtag speed (if supported)",
+               .usage = "<khz:0=rtck>",
+       },
+       {
+               .name = "jtag_rclk",
+               .handler = &handle_jtag_rclk_command,
+               .mode = COMMAND_ANY,
+               .help = "set JTAG speed to RCLK or use fallback speed",
+               .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]");
-
-       register_command(cmd_ctx, NULL, "jtag_nsrst_delay",
-                       handle_jtag_nsrst_delay_command, COMMAND_ANY,
-                       "jtag_nsrst_delay <ms> "
-                       "- delay after deasserting srst in ms");
-       register_command(cmd_ctx, NULL, "jtag_ntrst_delay",
-                       handle_jtag_ntrst_delay_command, COMMAND_ANY,
-                       "jtag_ntrst_delay <ms> "
-                       "- delay after deasserting trst in ms");
-
-       register_command(cmd_ctx, NULL, "jtag_nsrst_assert_width",
-                       handle_jtag_nsrst_assert_width_command, COMMAND_ANY,
-                       "jtag_nsrst_assert_width <ms> "
-                       "- delay after asserting srst in ms");
-       register_command(cmd_ctx, NULL, "jtag_ntrst_assert_width",
-                       handle_jtag_ntrst_assert_width_command, COMMAND_ANY,
-                       "jtag_ntrst_assert_width <ms> "
-                       "- delay after asserting trst in ms");
-
-       register_command(cmd_ctx, NULL, "scan_chain",
-                       handle_scan_chain_command, COMMAND_EXEC,
-                       "print current scan chain configuration");
-
-       register_command(cmd_ctx, NULL, "jtag_reset",
-                       handle_jtag_reset_command, COMMAND_EXEC,
-                       "toggle reset lines <trst> <srst>");
-       register_command(cmd_ctx, NULL, "runtest",
-                       handle_runtest_command, COMMAND_EXEC,
-                       "move to Run-Test/Idle, and execute <num_cycles>");
-       register_command(cmd_ctx, NULL, "irscan",
-                       handle_irscan_command, COMMAND_EXEC,
-                       "execute IR scan <device> <instr> [dev2] [instr2] ...");
-
-       register_jim(cmd_ctx, "drscan", Jim_Command_drscan,
-                       "execute DR scan <device> "
-                       "<num_bits> <value> <num_bits1> <value2> ...");
-
-       register_jim(cmd_ctx, "flush_count", Jim_Command_flush_count,
-                       "returns number of times the JTAG queue has been flushed");
-
-       register_jim(cmd_ctx, "pathmove", Jim_Command_pathmove,
-                       "<state1>,<state2>,<state3>... "
-                       "- move JTAG to state1 then to state2, state3, etc.");
-
-       register_command(cmd_ctx, NULL, "verify_ircapture",
-                       handle_verify_ircapture_command, COMMAND_ANY,
-                       "verify value captured during Capture-IR <enable | disable>");
-       register_command(cmd_ctx, NULL, "verify_jtag",
-                       handle_verify_jtag_command, COMMAND_ANY,
-                       "verify value capture <enable | disable>");
-
-       register_command(cmd_ctx, NULL, "tms_sequence",
-                       handle_tms_sequence_command, COMMAND_ANY,
-                       "choose short(default) or long tms_sequence <short | long>");
+                       "[srst_push_pull|srst_open_drain]",
+       },
+       {
+               .name = "jtag_nsrst_delay",
+               .handler = &handle_jtag_nsrst_delay_command,
+               .mode = COMMAND_ANY,
+               .help = "delay after deasserting srst in ms",
+               .usage = "<ms>",
+       },
+       {
+               .name = "jtag_ntrst_delay",
+               .handler = &handle_jtag_ntrst_delay_command,
+               .mode = COMMAND_ANY,
+               .help = "delay after deasserting trst in ms",
+               .usage = "<ms>"
+       },
+       {
+               .name = "jtag_nsrst_assert_width",
+               .handler = &handle_jtag_nsrst_assert_width_command,
+               .mode = COMMAND_ANY,
+               .help = "delay after asserting srst in ms",
+               .usage = "<ms>"
+       },
+       {
+               .name = "jtag_ntrst_assert_width",
+               .handler = &handle_jtag_ntrst_assert_width_command,
+               .mode = COMMAND_ANY,
+               .help = "delay after asserting trst in ms",
+               .usage = "<ms>"
+       },
+       {
+               .name = "scan_chain",
+               .handler = &handle_scan_chain_command,
+               .mode = COMMAND_EXEC,
+               .help = "print current scan chain configuration",
+       },
+       {
+               .name = "jtag_reset",
+               .handler = &handle_jtag_reset_command,
+               .mode = COMMAND_EXEC,
+               .help = "toggle reset lines",
+               .usage = "<trst> <srst>",
+       },
+       {
+               .name = "runtest",
+               .handler = &handle_runtest_command,
+               .mode = COMMAND_EXEC,
+               .help = "move to Run-Test/Idle, and execute <num_cycles>",
+               .usage = "<num_cycles>"
+       },
+       {
+               .name = "irscan",
+               .handler = &handle_irscan_command,
+               .mode = COMMAND_EXEC,
+               .help = "execute IR scan",
+               .usage = "<device> <instr> [dev2] [instr2] ...",
+       },
+       {
+               .name = "verify_ircapture",
+               .handler = &handle_verify_ircapture_command,
+               .mode = COMMAND_ANY,
+               .help = "verify value captured during Capture-IR",
+               .usage = "<enable | disable>",
+       },
+       {
+               .name = "verify_jtag",
+               .handler = &handle_verify_jtag_command,
+               .mode = COMMAND_ANY,
+               .help = "verify value capture",
+               .usage = "<enable | disable>",
+       },
+       {
+               .name = "tms_sequence",
+               .handler = &handle_tms_sequence_command,
+               .mode = COMMAND_ANY,
+               .help = "choose short(default) or long tms_sequence",
+               .usage = "<short | long>",
+       },
+       {
+               .name = "jtag",
+               .mode = COMMAND_ANY,
+               .help = "perform jtag tap actions",
 
-       return ERROR_OK;
+               .chain = jtag_subcommand_handlers,
+       },
+       {
+               .chain = jtag_command_handlers_to_move,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+int jtag_register_commands(struct command_context *cmd_ctx)
+{
+       return register_commands(cmd_ctx, NULL, jtag_command_handlers);
 }
-
-

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)