hla/hla_interface: call HLA layout API close() on quit

[openocd] / src / jtag / hla / hla_interface.c

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 919313300576e932e14debb749d027a03439c0ce..85f083cecda1d928c97ae51598f11d9600668552 100644 (file)
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -37,7 +37,7 @@
 
 #include <target/target.h>
 
-static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0}, 0, 0 };
+static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0, -1}, 0, 0 };
 
 int hl_interface_open(enum hl_transports tr)
 {
@@ -72,7 +72,7 @@ int hl_interface_init_target(struct target *t)
         * can setup the private pointer in the tap structure
         * if the interface match the tap idcode
         */
-       res = hl_if.layout->api->idcode(hl_if.fd, &t->tap->idcode);
+       res = hl_if.layout->api->idcode(hl_if.handle, &t->tap->idcode);
 
        if (res != ERROR_OK)
                return res;
@@ -92,8 +92,11 @@ int hl_interface_init_target(struct target *t)
        }
 
        if (found == 0) {
-               LOG_ERROR("hl_interface_init_target: target not found: idcode: 0x%08x",
-                               t->tap->idcode);
+               LOG_WARNING("UNEXPECTED idcode: 0x%08" PRIx32, t->tap->idcode);
+               for (ii = 0; ii < limit; ii++)
+                       LOG_ERROR("expected %u of %u: 0x%08" PRIx32, ii + 1, limit,
+                               t->tap->expected_ids[ii]);
+
                return ERROR_FAIL;
        }
 
@@ -121,6 +124,9 @@ static int hl_interface_quit(void)
        }
        hl_if.param.trace_source_hz = 0;
 
+       if (hl_if.layout->api->close)
+               hl_if.layout->api->close(hl_if.handle);
+
        return ERROR_OK;
 }
 
@@ -137,7 +143,7 @@ int hl_interface_init_reset(void)
         * we will attempt it again */
        if (hl_if.param.connect_under_reset) {
                jtag_add_reset(0, 1);
-               hl_if.layout->api->assert_srst(hl_if.fd, 0);
+               hl_if.layout->api->assert_srst(hl_if.handle, 0);
        } else {
                jtag_add_reset(0, 0);
        }
@@ -145,6 +151,49 @@ int hl_interface_init_reset(void)
        return ERROR_OK;
 }
 
+static int hl_interface_khz(int khz, int *jtag_speed)
+{
+       if (hl_if.layout->api->speed == NULL)
+               return ERROR_OK;
+
+       *jtag_speed = hl_if.layout->api->speed(hl_if.handle, khz, true);
+       return ERROR_OK;
+}
+
+static int hl_interface_speed_div(int speed, int *khz)
+{
+       *khz = speed;
+       return ERROR_OK;
+}
+
+static int hl_interface_speed(int speed)
+{
+       if (hl_if.layout->api->speed == NULL)
+               return ERROR_OK;
+
+       if (hl_if.handle == NULL) {
+               /* pass speed as initial param as interface not open yet */
+               hl_if.param.initial_interface_speed = speed;
+               return ERROR_OK;
+       }
+
+       hl_if.layout->api->speed(hl_if.handle, speed, false);
+
+       return ERROR_OK;
+}
+
+int hl_interface_override_target(const char **targetname)
+{
+       if (hl_if.layout->api->override_target) {
+               if (hl_if.layout->api->override_target(*targetname)) {
+                       *targetname = "hla_target";
+                       return ERROR_OK;
+               } else
+                       return ERROR_FAIL;
+       }
+       return ERROR_FAIL;
+}
+
 COMMAND_HANDLER(hl_interface_handle_device_desc_command)
 {
        LOG_DEBUG("hl_interface_handle_device_desc_command");
@@ -214,21 +263,6 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(stlink_interface_handle_api_command)
-{
-       if (CMD_ARGC != 1)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       unsigned new_api;
-       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], new_api);
-       if ((new_api == 0) || (new_api > 2))
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       hl_if.param.api = new_api;
-
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(interface_handle_trace_command)
 {
        FILE *f = NULL;
@@ -254,6 +288,21 @@ COMMAND_HANDLER(interface_handle_trace_command)
        return ERROR_OK;
 }
 
+COMMAND_HANDLER(interface_handle_hla_command)
+{
+       if (CMD_ARGC != 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       if (!hl_if.layout->api->custom_command) {
+               LOG_ERROR("The selected adapter doesn't support custom commands");
+               return ERROR_FAIL;
+       }
+
+       hl_if.layout->api->custom_command(hl_if.handle, CMD_ARGV[0]);
+
+       return ERROR_OK;
+}
+
 static const struct command_registration hl_interface_command_handlers[] = {
        {
         .name = "hla_device_desc",
@@ -284,19 +333,19 @@ static const struct command_registration hl_interface_command_handlers[] = {
         .usage = "(vid pid)* ",
         },
         {
-        .name = "stlink_api",
-        .handler = &stlink_interface_handle_api_command,
-        .mode = COMMAND_CONFIG,
-        .help = "set the desired stlink api level",
-        .usage = "api version 1 or 2",
-        },
-        {
         .name = "trace",
         .handler = &interface_handle_trace_command,
         .mode = COMMAND_CONFIG,
         .help = "configure trace reception",
         .usage = "source_lock_hz [destination_path]",
         },
+        {
+        .name = "hla_command",
+        .handler = &interface_handle_hla_command,
+        .mode = COMMAND_EXEC,
+        .help = "execute a custom adapter-specific command",
+        .usage = "hla_command <command>",
+        },
        COMMAND_REGISTRATION_DONE
 };
 
@@ -308,4 +357,7 @@ struct jtag_interface hl_interface = {
        .init = hl_interface_init,
        .quit = hl_interface_quit,
        .execute_queue = hl_interface_execute_queue,
+       .speed = &hl_interface_speed,
+       .khz = &hl_interface_khz,
+       .speed_div = &hl_interface_speed_div,
 };