jtag: hla: use generic helper for commands 'jtag newtap' 'swd newdap'

The commands 'jtag newtap' and 'swd newdap' have to work either on
HLA transport and on standard JTAG/SWD. Having a dedicated
implementation for HLA is a non-sense.

Reuse the generic code jim_jtag_newtap() and drop the files
hla_tcl.[ch] as they are now empty.

Change-Id: I9dabbdc2a6f338f23b2fd3ed1a4dc3da0200c080
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7428
Tested-by: jenkins

diff --git a/src/jtag/hla/Makefile.am b/src/jtag/hla/Makefile.am
index 41117868ad06adc2b8123da7c1efa6f71f4159dd..ea6e11dd6370773d990932038211bc29bc295aaf 100644 (file)
--- a/src/jtag/hla/Makefile.am
+++ b/src/jtag/hla/Makefile.am
@@ -4,10 +4,8 @@ noinst_LTLIBRARIES += %D%/libocdhla.la
 
 %C%_libocdhla_la_SOURCES = \
        %D%/hla_transport.c \
-       %D%/hla_tcl.c \
        %D%/hla_interface.c \
        %D%/hla_layout.c \
        %D%/hla_transport.h \
        %D%/hla_interface.h \
-       %D%/hla_layout.h \
-       %D%/hla_tcl.h
+       %D%/hla_layout.h

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 6198b3db48c993bc427eab34803b2c24651b0183..f4bfeb1a142837de64223da01eb47735f8959113 100644 (file)
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -17,7 +17,6 @@
 #include <transport/transport.h>
 #include <helper/time_support.h>
 
-#include <jtag/hla/hla_tcl.h>
 #include <jtag/hla/hla_layout.h>
 #include <jtag/hla/hla_transport.h>
 #include <jtag/hla/hla_interface.h>

diff --git a/src/jtag/hla/hla_layout.c b/src/jtag/hla/hla_layout.c
index a760f0b3ccae7d6307c5c77072bda8b052c783b8..51671d60aa39901eb8be3597e5c9bf086a3e55c2 100644 (file)
--- a/src/jtag/hla/hla_layout.c
+++ b/src/jtag/hla/hla_layout.c
@@ -18,7 +18,6 @@
 #include <helper/time_support.h>
 
 #include <jtag/hla/hla_layout.h>
-#include <jtag/hla/hla_tcl.h>
 #include <jtag/hla/hla_transport.h>
 #include <jtag/hla/hla_interface.h>
 

diff --git a/src/jtag/hla/hla_tcl.c b/src/jtag/hla/hla_tcl.c
deleted file mode 100644 (file)
index 3283399..0000000
--- a/src/jtag/hla/hla_tcl.c
+++ /dev/null
@@ -1,143 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/***************************************************************************
- *   Copyright (C) 2011 by Mathias Kuester                                 *
- *   Mathias Kuester <kesmtp@freenet.de>                                   *
- *                                                                         *
- *   Copyright (C) 2012 by Spencer Oliver                                  *
- *   spen@spen-soft.co.uk                                                  *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* project specific includes */
-#include <jtag/interface.h>
-#include <transport/transport.h>
-#include <helper/time_support.h>
-
-static int jim_newtap_expected_id(struct jim_nvp *n, struct jim_getopt_info *goi,
-                                 struct jtag_tap *tap)
-{
-       jim_wide w;
-       int e = jim_getopt_wide(goi, &w);
-       if (e != JIM_OK) {
-               Jim_SetResultFormatted(goi->interp, "option: %s bad parameter",
-                                      n->name);
-               return e;
-       }
-
-       uint32_t *p = realloc(tap->expected_ids,
-                             (tap->expected_ids_cnt + 1) * sizeof(uint32_t));
-       if (!p) {
-               Jim_SetResultFormatted(goi->interp, "no memory");
-               return JIM_ERR;
-       }
-
-       tap->expected_ids = p;
-       tap->expected_ids[tap->expected_ids_cnt++] = w;
-
-       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
-#define NTAP_OPT_VERSION   6
-#define NTAP_OPT_BYPASS    7
-
-static int jim_hl_newtap_cmd(struct jim_getopt_info *goi)
-{
-       struct jtag_tap *tap;
-       int x;
-       int e;
-       struct jim_nvp *n;
-       char *cp;
-       const struct jim_nvp opts[] = {
-               { .name = "-irlen",       .value = NTAP_OPT_IRLEN },
-               { .name = "-irmask",       .value = NTAP_OPT_IRMASK },
-               { .name = "-ircapture",       .value = NTAP_OPT_IRCAPTURE },
-               { .name = "-enable",       .value = NTAP_OPT_ENABLED },
-               { .name = "-disable",       .value = NTAP_OPT_DISABLED },
-               { .name = "-expected-id",       .value = NTAP_OPT_EXPECTED_ID },
-               { .name = "-ignore-version",       .value = NTAP_OPT_VERSION },
-               { .name = "-ignore-bypass",       .value = NTAP_OPT_BYPASS },
-               { .name = NULL, .value = -1},
-       };
-
-       tap = calloc(1, sizeof(struct jtag_tap));
-       if (!tap) {
-               Jim_SetResultFormatted(goi->interp, "no memory");
-               return JIM_ERR;
-       }
-
-       /*
-        * we expect CHIP + TAP + OPTIONS
-        * */
-       if (goi->argc < 3) {
-               Jim_SetResultFormatted(goi->interp,
-                                      "Missing CHIP TAP OPTIONS ....");
-               free(tap);
-               return JIM_ERR;
-       }
-
-       const char *tmp;
-       jim_getopt_string(goi, &tmp, NULL);
-       tap->chip = strdup(tmp);
-
-       jim_getopt_string(goi, &tmp, NULL);
-       tap->tapname = strdup(tmp);
-
-       /* name + dot + name + null */
-       x = strlen(tap->chip) + 1 + strlen(tap->tapname) + 1;
-       cp = malloc(x);
-       sprintf(cp, "%s.%s", tap->chip, tap->tapname);
-       tap->dotted_name = cp;
-
-       LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params",
-                 tap->chip, tap->tapname, tap->dotted_name, goi->argc);
-
-       while (goi->argc) {
-               e = jim_getopt_nvp(goi, opts, &n);
-               if (e != JIM_OK) {
-                       jim_getopt_nvp_unknown(goi, opts, 0);
-                       free(cp);
-                       free(tap);
-                       return e;
-               }
-               LOG_DEBUG("Processing option: %s", n->name);
-               switch (n->value) {
-               case NTAP_OPT_EXPECTED_ID:
-                       e = jim_newtap_expected_id(n, goi, tap);
-                       if (e != JIM_OK) {
-                               free(cp);
-                               free(tap);
-                               return e;
-                       }
-                       break;
-               case NTAP_OPT_IRLEN:
-               case NTAP_OPT_IRMASK:
-               case NTAP_OPT_IRCAPTURE:
-                       /* dummy read to ignore the next argument */
-                       jim_getopt_wide(goi, NULL);
-                       break;
-               }               /* switch (n->value) */
-       }                       /* while (goi->argc) */
-
-       /* default is enabled-after-reset */
-       tap->enabled = !tap->disabled_after_reset;
-
-       jtag_tap_init(tap);
-       return JIM_OK;
-}
-
-int jim_hl_newtap(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
-{
-       struct jim_getopt_info goi;
-       jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
-       return jim_hl_newtap_cmd(&goi);
-}

diff --git a/src/jtag/hla/hla_tcl.h b/src/jtag/hla/hla_tcl.h
deleted file mode 100644 (file)
index b028e4b..0000000
--- a/src/jtag/hla/hla_tcl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/***************************************************************************
- *   Copyright (C) 2011 by Mathias Kuester                                 *
- *   Mathias Kuester <kesmtp@freenet.de>                                   *
- *                                                                         *
- *   Copyright (C) 2012 by Spencer Oliver                                  *
- *   spen@spen-soft.co.uk                                                  *
- ***************************************************************************/
-
-#ifndef OPENOCD_JTAG_HLA_HLA_TCL_H
-#define OPENOCD_JTAG_HLA_HLA_TCL_H
-
-/** */
-int jim_hl_newtap(Jim_Interp *interp, int argc, Jim_Obj * const *argv);
-
-#endif /* OPENOCD_JTAG_HLA_HLA_TCL_H */

diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c
index 91228bed2e29a146872743c4e4cc59ee5a986552..004e9f0c53da63cbc8cf400fa40e7c040b7a3a72 100644 (file)
--- a/src/jtag/hla/hla_transport.c
+++ b/src/jtag/hla/hla_transport.c
@@ -18,7 +18,6 @@
 #include <transport/transport.h>
 #include <helper/time_support.h>
 #include <target/target.h>
-#include <jtag/hla/hla_tcl.h>
 #include <jtag/hla/hla_transport.h>
 #include <jtag/hla/hla_interface.h>
 
@@ -38,7 +37,7 @@ static const struct command_registration hl_swd_transport_subcommand_handlers[]
        {
         .name = "newdap",
         .mode = COMMAND_CONFIG,
-        .jim_handler = jim_hl_newtap,
+        .jim_handler = jim_jtag_newtap,
         .help = "declare a new SWD DAP",
         },
        COMMAND_REGISTRATION_DONE
@@ -59,7 +58,7 @@ static const struct command_registration hl_transport_jtag_subcommand_handlers[]
        {
         .name = "newtap",
         .mode = COMMAND_CONFIG,
-        .jim_handler = jim_hl_newtap,
+        .jim_handler = jim_jtag_newtap,
         .help = "Create a new TAP instance named basename.tap_type, "
         "and appends it to the scan chain.",
         .usage = "basename tap_type '-irlen' count "