openocd: build: add SPDX tag

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

diff --git a/src/jtag/aice/aice_interface.c b/src/jtag/aice/aice_interface.c
index 86e9d16c105488c8269dcc4a2d1d762de0504795..cb126c6b179dba6f6a293c52af9b1883ec4b4eb3 100644 (file)
--- a/src/jtag/aice/aice_interface.c
+++ b/src/jtag/aice/aice_interface.c
@@ -20,6 +20,7 @@
 #include "config.h"
 #endif
 
+#include <jtag/adapter.h>
 #include <jtag/interface.h>
 #include <jtag/commands.h>
 #include <transport/transport.h>
@@ -121,7 +122,7 @@ int aice_init_targets(void)
  */
 static int aice_init(void)
 {
-       if (ERROR_OK != aice_port->api->open(&param)) {
+       if (aice_port->api->open(&param) != ERROR_OK) {
                LOG_ERROR("Cannot find AICE Interface! Please check "
                                "connection and permissions.");
                return ERROR_JTAG_INIT_FAILED;
@@ -217,7 +218,7 @@ static int aice_khz(int khz, int *jtag_speed)
        int i;
        for (i = 0 ; i < AICE_KHZ_TO_SPEED_MAP_SIZE ; i++) {
                if (khz == aice_khz_to_speed_map[i]) {
-                       if (8 <= i)
+                       if (i >= 8)
                                *jtag_speed = i | AICE_TCK_CONTROL_TCK3048;
                        else
                                *jtag_speed = i;
@@ -269,7 +270,7 @@ COMMAND_HANDLER(aice_handle_aice_info_command)
        LOG_DEBUG("aice_handle_aice_info_command");
 
        command_print(CMD, "Description: %s", param.device_desc);
-       command_print(CMD, "Serial number: %s", param.serial);
+       command_print(CMD, "Serial number: %s", adapter_get_required_serial());
        if (strncmp(aice_port->name, "aice_pipe", 9) == 0)
                command_print(CMD, "Adapter: %s", param.adapter_name);
 
@@ -308,18 +309,6 @@ COMMAND_HANDLER(aice_handle_aice_desc_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(aice_handle_aice_serial_command)
-{
-       LOG_DEBUG("aice_handle_aice_serial_command");
-
-       if (CMD_ARGC == 1)
-               param.serial = strdup(CMD_ARGV[0]);
-       else
-               LOG_ERROR("expected exactly one argument to aice serial <serial-number>");
-
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(aice_handle_aice_vid_pid_command)
 {
        LOG_DEBUG("aice_handle_aice_vid_pid_command");
@@ -438,13 +427,6 @@ static const struct command_registration aice_subcommand_handlers[] = {
                .help = "set the aice device description",
                .usage = "[description string]",
        },
-       {
-               .name = "serial",
-               .handler = &aice_handle_aice_serial_command,
-               .mode = COMMAND_CONFIG,
-               .help = "set the serial number of the AICE device",
-               .usage = "[serial string]",
-       },
        {
                .name = "vid_pid",
                .handler = &aice_handle_aice_vid_pid_command,