Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target: add deprecated target name support
[openocd.git] / src / jtag / hla / hla_transport.c
diff --git a/src/jtag/stlink/stlink_transport.c b/src/jtag/hla/hla_transport.c
similarity index 65%
rename from src/jtag/stlink/stlink_transport.c
rename to src/jtag/hla/hla_transport.c
index d83496afad9ccc9efde3e4531c2b43f1014657f2..177459bd3e92ac776fdc7f010683cb85f7a6f357 100644 (file)
--- a/src/jtag/stlink/stlink_transport.c
+++ b/src/jtag/hla/hla_transport.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2011 by Mathias Kuester                                 *
  *   Mathias Kuester <kesmtp@freenet.de>                                   *
  *                                                                         *
+ *   Copyright (C) 2012 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -28,28 +31,28 @@
 #include <transport/transport.h>
 #include <helper/time_support.h>
 #include <target/target.h>
-#include <jtag/stlink/stlink_tcl.h>
-#include <jtag/stlink/stlink_transport.h>
-#include <jtag/stlink/stlink_interface.h>
+#include <jtag/hla/hla_tcl.h>
+#include <jtag/hla/hla_transport.h>
+#include <jtag/hla/hla_interface.h>
 
-COMMAND_HANDLER(stlink_transport_jtag_command)
+COMMAND_HANDLER(hl_transport_jtag_command)
 {
-       LOG_DEBUG("stlink_transport_jtag_command");
+       LOG_DEBUG("hl_transport_jtag_command");
 
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(stlink_transport_reset_command)
+COMMAND_HANDLER(hl_transport_reset_command)
 {
-       return stlink_interface_init_reset();
+       return hl_interface_init_reset();
 }
 
 static const struct command_registration
-stlink_transport_stlink_subcommand_handlers[] = {
+hl_transport_stlink_subcommand_handlers[] = {
        {
         .name = "newtap",
         .mode = COMMAND_CONFIG,
-        .jim_handler = jim_stlink_newtap,
+        .jim_handler = jim_hl_newtap,
         .help = "Create a new TAP instance named basename.tap_type, "
         "and appends it to the scan chain.",
         .usage = "basename tap_type '-irlen' count "
@@ -60,23 +63,23 @@ stlink_transport_stlink_subcommand_handlers[] = {
 };
 
 static const struct command_registration
-stlink_transport_jtag_subcommand_handlers[] = {
+hl_transport_jtag_subcommand_handlers[] = {
        {
         .name = "init",
         .mode = COMMAND_ANY,
-        .handler = stlink_transport_jtag_command,
+        .handler = hl_transport_jtag_command,
         .usage = ""
         },
        {
         .name = "arp_init",
         .mode = COMMAND_ANY,
-        .handler = stlink_transport_jtag_command,
+        .handler = hl_transport_jtag_command,
         .usage = ""
         },
        {
         .name = "arp_init-reset",
         .mode = COMMAND_ANY,
-        .handler = stlink_transport_reset_command,
+        .handler = hl_transport_reset_command,
         .usage = ""
         },
        {
@@ -92,13 +95,13 @@ stlink_transport_jtag_subcommand_handlers[] = {
        {
         .name = "tapdisable",
         .mode = COMMAND_EXEC,
-        .handler = stlink_transport_jtag_command,
+        .handler = hl_transport_jtag_command,
         .usage = "",
         },
        {
         .name = "configure",
         .mode = COMMAND_EXEC,
-        .handler = stlink_transport_jtag_command,
+        .handler = hl_transport_jtag_command,
         .usage = "",
         },
        {
@@ -109,7 +112,7 @@ stlink_transport_jtag_subcommand_handlers[] = {
        {
         .name = "names",
         .mode = COMMAND_ANY,
-        .handler = stlink_transport_jtag_command,
+        .handler = hl_transport_jtag_command,
         .usage = "",
         },
 
@@ -123,29 +126,29 @@ static const struct command_registration stlink_transport_command_handlers[] = {
         .mode = COMMAND_ANY,
         .help = "perform stlink actions",
         .usage = "",
-        .chain = stlink_transport_stlink_subcommand_handlers,
+        .chain = hl_transport_stlink_subcommand_handlers,
         },
        {
         .name = "jtag",
         .mode = COMMAND_ANY,
         .usage = "",
-        .chain = stlink_transport_jtag_subcommand_handlers,
+        .chain = hl_transport_jtag_subcommand_handlers,
         },
        COMMAND_REGISTRATION_DONE
 };
 
-static int stlink_transport_register_commands(struct command_context *cmd_ctx)
+static int hl_transport_register_commands(struct command_context *cmd_ctx)
 {
        return register_commands(cmd_ctx, NULL,
                                 stlink_transport_command_handlers);
 }
 
-static int stlink_transport_init(struct command_context *cmd_ctx)
+static int hl_transport_init(struct command_context *cmd_ctx)
 {
-       LOG_DEBUG("stlink_transport_init");
+       LOG_DEBUG("hl_transport_init");
        struct target *t = get_current_target(cmd_ctx);
        struct transport *transport;
-       enum stlink_transports tr;
+       enum hl_transports tr;
 
        if (!t) {
                LOG_ERROR("no current target");
@@ -162,26 +165,26 @@ static int stlink_transport_init(struct command_context *cmd_ctx)
        LOG_DEBUG("current transport %s", transport->name);
 
        /* get selected transport as enum */
-       tr = STLINK_TRANSPORT_UNKNOWN;
+       tr = HL_TRANSPORT_UNKNOWN;
 
        if (strcmp(transport->name, "stlink_swd") == 0)
-               tr = STLINK_TRANSPORT_SWD;
+               tr = HL_TRANSPORT_SWD;
        else if (strcmp(transport->name, "stlink_jtag") == 0)
-               tr = STLINK_TRANSPORT_JTAG;
+               tr = HL_TRANSPORT_JTAG;
        else if (strcmp(transport->name, "stlink_swim") == 0)
-               tr = STLINK_TRANSPORT_SWIM;
+               tr = HL_TRANSPORT_SWIM;
 
-       int retval = stlink_interface_open(tr);
+       int retval = hl_interface_open(tr);
 
        if (retval != ERROR_OK)
                return retval;
 
-       return stlink_interface_init_target(t);
+       return hl_interface_init_target(t);
 }
 
-static int stlink_transport_select(struct command_context *ctx)
+static int hl_transport_select(struct command_context *ctx)
 {
-       LOG_DEBUG("stlink_transport_select");
+       LOG_DEBUG("hl_transport_select");
 
        int retval;
 
@@ -189,7 +192,7 @@ static int stlink_transport_select(struct command_context *ctx)
         * That works with only C code ... no Tcl glue required.
         */
 
-       retval = stlink_transport_register_commands(ctx);
+       retval = hl_transport_register_commands(ctx);
 
        if (retval != ERROR_OK)
                return retval;
@@ -197,35 +200,30 @@ static int stlink_transport_select(struct command_context *ctx)
        return ERROR_OK;
 }
 
-static struct transport stlink_swd_transport = {
+static struct transport hl_swd_transport = {
        .name = "stlink_swd",
-       .select = stlink_transport_select,
-       .init = stlink_transport_init,
+       .select = hl_transport_select,
+       .init = hl_transport_init,
 };
 
-static struct transport stlink_jtag_transport = {
+static struct transport hl_jtag_transport = {
        .name = "stlink_jtag",
-       .select = stlink_transport_select,
-       .init = stlink_transport_init,
+       .select = hl_transport_select,
+       .init = hl_transport_init,
 };
 
-static struct transport stlink_swim_transport = {
+static struct transport hl_swim_transport = {
        .name = "stlink_swim",
-       .select = stlink_transport_select,
-       .init = stlink_transport_init,
+       .select = hl_transport_select,
+       .init = hl_transport_init,
 };
 
-const char *stlink_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL };
-
-static void stlink_constructor(void) __attribute__ ((constructor));
-static void stlink_constructor(void)
-{
-       transport_register(&stlink_swd_transport);
-       transport_register(&stlink_jtag_transport);
-       transport_register(&stlink_swim_transport);
-}
+const char *hl_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL };
 
-bool transport_is_stlink(void)
+static void hl_constructor(void) __attribute__ ((constructor));
+static void hl_constructor(void)
 {
-       return get_current_transport() == &stlink_swd_transport;
+       transport_register(&hl_swd_transport);
+       transport_register(&hl_jtag_transport);
+       transport_register(&hl_swim_transport);
 }
Open On-Chip Debugger

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)