tcl/target: use command 'jtag newtap' to add a boundary scan TAP

[openocd.git] / src / jtag / hla / hla_transport.c

diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c
index 177459bd3e92ac776fdc7f010683cb85f7a6f357..3383577481df8492d9c77f34a942850616f85409 100644 (file)
--- a/src/jtag/hla/hla_transport.c
+++ b/src/jtag/hla/hla_transport.c
@@ -16,9 +16,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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -64,6 +62,9 @@ hl_transport_stlink_subcommand_handlers[] = {
 
 static const struct command_registration
 hl_transport_jtag_subcommand_handlers[] = {
+       {
+        .chain = hl_transport_stlink_subcommand_handlers,
+        },
        {
         .name = "init",
         .mode = COMMAND_ANY,
@@ -122,9 +123,9 @@ hl_transport_jtag_subcommand_handlers[] = {
 static const struct command_registration stlink_transport_command_handlers[] = {
 
        {
-        .name = "stlink",
+        .name = "hla",
         .mode = COMMAND_ANY,
-        .help = "perform stlink actions",
+        .help = "perform hl adapter actions",
         .usage = "",
         .chain = hl_transport_stlink_subcommand_handlers,
         },
@@ -134,6 +135,12 @@ static const struct command_registration stlink_transport_command_handlers[] = {
         .usage = "",
         .chain = hl_transport_jtag_subcommand_handlers,
         },
+       {
+        .name = "jtag_ntrst_delay",
+        .mode = COMMAND_ANY,
+        .handler = hl_transport_jtag_command,
+        .usage = "",
+        },
        COMMAND_REGISTRATION_DONE
 };
 
@@ -167,12 +174,10 @@ static int hl_transport_init(struct command_context *cmd_ctx)
        /* get selected transport as enum */
        tr = HL_TRANSPORT_UNKNOWN;
 
-       if (strcmp(transport->name, "stlink_swd") == 0)
+       if (strcmp(transport->name, "hla_swd") == 0)
                tr = HL_TRANSPORT_SWD;
-       else if (strcmp(transport->name, "stlink_jtag") == 0)
+       else if (strcmp(transport->name, "hla_jtag") == 0)
                tr = HL_TRANSPORT_JTAG;
-       else if (strcmp(transport->name, "stlink_swim") == 0)
-               tr = HL_TRANSPORT_SWIM;
 
        int retval = hl_interface_open(tr);
 
@@ -201,29 +206,31 @@ static int hl_transport_select(struct command_context *ctx)
 }
 
 static struct transport hl_swd_transport = {
-       .name = "stlink_swd",
+       .name = "hla_swd",
        .select = hl_transport_select,
        .init = hl_transport_init,
+       .override_target = hl_interface_override_target,
 };
 
 static struct transport hl_jtag_transport = {
-       .name = "stlink_jtag",
+       .name = "hla_jtag",
        .select = hl_transport_select,
        .init = hl_transport_init,
+       .override_target = hl_interface_override_target,
 };
 
-static struct transport hl_swim_transport = {
-       .name = "stlink_swim",
-       .select = hl_transport_select,
-       .init = hl_transport_init,
-};
-
-const char *hl_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL };
+const char *hl_transports[] = { "hla_swd", "hla_jtag", NULL };
 
 static void hl_constructor(void) __attribute__ ((constructor));
 static void hl_constructor(void)
 {
        transport_register(&hl_swd_transport);
        transport_register(&hl_jtag_transport);
-       transport_register(&hl_swim_transport);
+}
+
+bool transport_is_hla(void)
+{
+       struct transport *t;
+       t = get_current_transport();
+       return t == &hl_swd_transport || t == &hl_jtag_transport;
 }