command: fix the mode for command "jtag configure"

[openocd.git] / src / jtag / aice / aice_transport.c

diff --git a/src/jtag/aice/aice_transport.c b/src/jtag/aice/aice_transport.c
index 0c208bfa25ec86111bea10a26f9a2bf9350011d9..06583183d25c79790f6bf193ee91384afa376c9f 100644 (file)
--- a/src/jtag/aice/aice_transport.c
+++ b/src/jtag/aice/aice_transport.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -90,11 +88,13 @@ static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
                free(pTap);
                return JIM_ERR;
        }
-       Jim_GetOpt_String(goi, &cp, NULL);
-       pTap->chip = strdup(cp);
 
-       Jim_GetOpt_String(goi, &cp, NULL);
-       pTap->tapname = strdup(cp);
+       const char *tmp;
+       Jim_GetOpt_String(goi, &tmp, NULL);
+       pTap->chip = strdup(tmp);
+
+       Jim_GetOpt_String(goi, &tmp, NULL);
+       pTap->tapname = strdup(tmp);
 
        /* name + dot + name + null */
        x = strlen(pTap->chip) + 1 + strlen(pTap->tapname) + 1;
@@ -109,7 +109,7 @@ static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
                e = Jim_GetOpt_Nvp(goi, opts, &n);
                if (e != JIM_OK) {
                        Jim_GetOpt_NvpUnknown(goi, opts, 0);
-                       free((void *)pTap->dotted_name);
+                       free(cp);
                        free(pTap);
                        return e;
                }
@@ -118,7 +118,7 @@ static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
                        case NTAP_OPT_EXPECTED_ID:
                                e = jim_newtap_expected_id(n, goi, pTap);
                                if (JIM_OK != e) {
-                                       free((void *)pTap->dotted_name);
+                                       free(cp);
                                        free(pTap);
                                        return e;
                                }
@@ -158,6 +158,59 @@ COMMAND_HANDLER(handle_aice_init_command)
        return jtag_init(CMD_CTX);
 }
 
+COMMAND_HANDLER(handle_scan_chain_command)
+{
+       struct jtag_tap *tap;
+       char expected_id[12];
+
+       aice_scan_jtag_chain();
+       tap = jtag_all_taps();
+       command_print(CMD_CTX,
+               "   TapName             Enabled  IdCode     Expected   IrLen IrCap IrMask");
+       command_print(CMD_CTX,
+               "-- ------------------- -------- ---------- ---------- ----- ----- ------");
+
+       while (tap) {
+               uint32_t expected, expected_mask, ii;
+
+               snprintf(expected_id, sizeof expected_id, "0x%08x",
+                       (unsigned)((tap->expected_ids_cnt > 0)
+                                  ? tap->expected_ids[0]
+                                  : 0));
+               if (tap->ignore_version)
+                       expected_id[2] = '*';
+
+               expected = buf_get_u32(tap->expected, 0, tap->ir_length);
+               expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
+
+               command_print(CMD_CTX,
+                       "%2d %-18s     %c     0x%08x %s %5d 0x%02x  0x%02x",
+                       tap->abs_chain_position,
+                       tap->dotted_name,
+                       tap->enabled ? 'Y' : 'n',
+                       (unsigned int)(tap->idcode),
+                       expected_id,
+                       (unsigned int)(tap->ir_length),
+                       (unsigned int)(expected),
+                       (unsigned int)(expected_mask));
+
+               for (ii = 1; ii < tap->expected_ids_cnt; ii++) {
+                       snprintf(expected_id, sizeof expected_id, "0x%08x",
+                               (unsigned) tap->expected_ids[ii]);
+                       if (tap->ignore_version)
+                               expected_id[2] = '*';
+
+                       command_print(CMD_CTX,
+                               "                                           %s",
+                               expected_id);
+               }
+
+               tap = tap->next_tap;
+       }
+
+       return ERROR_OK;
+}
+
 static int jim_aice_arp_init(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
        LOG_DEBUG("No implement: jim_aice_arp_init");
@@ -287,7 +340,7 @@ aice_transport_jtag_subcommand_handlers[] = {
        },
        {
                .name = "configure",
-               .mode = COMMAND_EXEC,
+               .mode = COMMAND_ANY,
                .jim_handler = jim_jtag_configure,
                .help = "Provide a Tcl handler for the specified "
                        "TAP event.",
@@ -307,6 +360,13 @@ aice_transport_jtag_subcommand_handlers[] = {
                .jim_handler = jim_aice_names,
                .help = "Returns list of all JTAG tap names.",
        },
+       {
+               .name = "scan_chain",
+               .handler = handle_scan_chain_command,
+               .mode = COMMAND_ANY,
+               .help = "print current scan chain configuration",
+               .usage = ""
+       },
 
        COMMAND_REGISTRATION_DONE
 };