openocd: fix SPDX tag format for files .c
[fw/openocd] / src / jtag / aice / aice_usb.c
index 8c3a629a037a1064b541eeef19d805d5b30b9fa1..b5d0f0b6e48777ad3fe248eb783d1f7d5aa245c6 100644 (file)
@@ -1,25 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2013 by Andes Technology                                *
  *   Hsiangkai Wang <hkwang@andestech.com>                                 *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <jtag/drivers/libusb_common.h>
+#include <helper/system.h>
+#include <jtag/drivers/libusb_helper.h>
 #include <helper/log.h>
 #include <helper/time_support.h>
 #include <target/target.h>
@@ -40,41 +30,41 @@ static int aice_max_retry_times = 50;
 static enum aice_target_endian data_endian;
 
 /* Constants for AICE command format length */
-static const int32_t AICE_FORMAT_HTDA = 3;
-static const int32_t AICE_FORMAT_HTDC  = 7;
-static const int32_t AICE_FORMAT_HTDMA = 4;
-static const int32_t AICE_FORMAT_HTDMB = 8;
-static const int32_t AICE_FORMAT_HTDMC = 8;
-static const int32_t AICE_FORMAT_HTDMD = 12;
-static const int32_t AICE_FORMAT_DTHA  = 6;
-static const int32_t AICE_FORMAT_DTHB  = 2;
-static const int32_t AICE_FORMAT_DTHMA = 8;
-static const int32_t AICE_FORMAT_DTHMB = 4;
+#define AICE_FORMAT_HTDA        (3)
+#define AICE_FORMAT_HTDC        (7)
+#define AICE_FORMAT_HTDMA       (4)
+#define AICE_FORMAT_HTDMB       (8)
+#define AICE_FORMAT_HTDMC       (8)
+#define AICE_FORMAT_HTDMD       (12)
+#define AICE_FORMAT_DTHA        (6)
+#define AICE_FORMAT_DTHB        (2)
+#define AICE_FORMAT_DTHMA       (8)
+#define AICE_FORMAT_DTHMB       (4)
 
 /* Constants for AICE command */
-static const uint8_t AICE_CMD_SCAN_CHAIN = 0x00;
-static const uint8_t AICE_CMD_T_READ_MISC = 0x20;
-static const uint8_t AICE_CMD_T_READ_EDMSR = 0x21;
-static const uint8_t AICE_CMD_T_READ_DTR = 0x22;
-static const uint8_t AICE_CMD_T_READ_MEM_B = 0x24;
-static const uint8_t AICE_CMD_T_READ_MEM_H = 0x25;
-static const uint8_t AICE_CMD_T_READ_MEM = 0x26;
-static const uint8_t AICE_CMD_T_FASTREAD_MEM = 0x27;
-static const uint8_t AICE_CMD_T_WRITE_MISC = 0x28;
-static const uint8_t AICE_CMD_T_WRITE_EDMSR    = 0x29;
-static const uint8_t AICE_CMD_T_WRITE_DTR = 0x2A;
-static const uint8_t AICE_CMD_T_WRITE_DIM = 0x2B;
-static const uint8_t AICE_CMD_T_WRITE_MEM_B = 0x2C;
-static const uint8_t AICE_CMD_T_WRITE_MEM_H = 0x2D;
-static const uint8_t AICE_CMD_T_WRITE_MEM = 0x2E;
-static const uint8_t AICE_CMD_T_FASTWRITE_MEM = 0x2F;
-static const uint8_t AICE_CMD_T_EXECUTE = 0x3E;
-static const uint8_t AICE_CMD_READ_CTRL = 0x50;
-static const uint8_t AICE_CMD_WRITE_CTRL = 0x51;
-static const uint8_t AICE_CMD_BATCH_BUFFER_READ = 0x60;
-static const uint8_t AICE_CMD_READ_DTR_TO_BUFFER = 0x61;
-static const uint8_t AICE_CMD_BATCH_BUFFER_WRITE = 0x68;
-static const uint8_t AICE_CMD_WRITE_DTR_FROM_BUFFER = 0x69;
+#define AICE_CMD_SCAN_CHAIN             0x00
+#define AICE_CMD_T_READ_MISC            0x20
+#define AICE_CMD_T_READ_EDMSR           0x21
+#define AICE_CMD_T_READ_DTR             0x22
+#define AICE_CMD_T_READ_MEM_B           0x24
+#define AICE_CMD_T_READ_MEM_H           0x25
+#define AICE_CMD_T_READ_MEM             0x26
+#define AICE_CMD_T_FASTREAD_MEM         0x27
+#define AICE_CMD_T_WRITE_MISC           0x28
+#define AICE_CMD_T_WRITE_EDMSR          0x29
+#define AICE_CMD_T_WRITE_DTR            0x2A
+#define AICE_CMD_T_WRITE_DIM            0x2B
+#define AICE_CMD_T_WRITE_MEM_B          0x2C
+#define AICE_CMD_T_WRITE_MEM_H          0x2D
+#define AICE_CMD_T_WRITE_MEM            0x2E
+#define AICE_CMD_T_FASTWRITE_MEM        0x2F
+#define AICE_CMD_T_EXECUTE              0x3E
+#define AICE_CMD_READ_CTRL              0x50
+#define AICE_CMD_WRITE_CTRL             0x51
+#define AICE_CMD_BATCH_BUFFER_READ      0x60
+#define AICE_CMD_READ_DTR_TO_BUFFER     0x61
+#define AICE_CMD_BATCH_BUFFER_WRITE     0x68
+#define AICE_CMD_WRITE_DTR_FROM_BUFFER  0x69
 
 /***************************************************************************/
 /* AICE commands' pack/unpack functions */
@@ -349,8 +339,8 @@ static void aice_unpack_dthmb(uint8_t *cmd_ack_code, uint8_t *target_id,
 /* calls the given usb_bulk_* function, allowing for the data to
  * trickle in with some timeouts  */
 static int usb_bulk_with_retries(
-                       int (*f)(libusb_device_handle *, int, char *, int, int, int *),
-                       libusb_device_handle *dev, int ep,
+                       int (*f)(struct libusb_device_handle *, int, char *, int, int, int *),
+                       struct libusb_device_handle *dev, int ep,
                        char *bytes, int size, int timeout, int *transferred)
 {
        int tries = 3, count = 0;
@@ -359,9 +349,9 @@ static int usb_bulk_with_retries(
                int result, ret;
 
                ret = f(dev, ep, bytes + count, size - count, timeout, &result);
-               if (ERROR_OK == ret)
+               if (ret == ERROR_OK)
                        count += result;
-               else if ((ERROR_TIMEOUT_REACHED != ret) || !--tries)
+               else if ((ret != ERROR_TIMEOUT_REACHED) || !--tries)
                        return ret;
        }
 
@@ -369,7 +359,7 @@ static int usb_bulk_with_retries(
        return ERROR_OK;
 }
 
-static int wrap_usb_bulk_write(libusb_device_handle *dev, int ep,
+static int wrap_usb_bulk_write(struct libusb_device_handle *dev, int ep,
                char *buff, int size, int timeout, int *transferred)
 {
 
@@ -379,7 +369,7 @@ static int wrap_usb_bulk_write(libusb_device_handle *dev, int ep,
        return 0;
 }
 
-static inline int usb_bulk_write_ex(libusb_device_handle *dev, int ep,
+static inline int usb_bulk_write_ex(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout)
 {
        int tr = 0;
@@ -421,10 +411,10 @@ static int aice_usb_write(uint8_t *out_buffer, int out_length)
 /* Read data from USB into in_buffer. */
 static int aice_usb_read(uint8_t *in_buffer, int expected_size)
 {
-       int32_t result = usb_bulk_read_ex(aice_handler.usb_handle, aice_handler.usb_read_ep,
+       int result = usb_bulk_read_ex(aice_handler.usb_handle, aice_handler.usb_read_ep,
                        (char *)in_buffer, expected_size, AICE_USB_TIMEOUT);
 
-       LOG_DEBUG_IO("aice_usb_read, result = %" PRId32, result);
+       LOG_DEBUG_IO("aice_usb_read, result = %d", result);
 
        return result;
 }
@@ -443,7 +433,7 @@ static int aice_usb_packet_flush(void)
        if (usb_out_packets_buffer_length == 0)
                return 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                LOG_DEBUG("Flush usb packets (AICE_COMMAND_MODE_PACK)");
 
                if (aice_usb_write(usb_out_packets_buffer,
@@ -457,7 +447,7 @@ static int aice_usb_packet_flush(void)
                usb_out_packets_buffer_length = 0;
                usb_in_packets_buffer_length = 0;
 
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                LOG_DEBUG("Flush usb packets (AICE_COMMAND_MODE_BATCH)");
 
                /* use BATCH_BUFFER_WRITE to fill command-batch-buffer */
@@ -484,7 +474,9 @@ static int aice_usb_packet_flush(void)
 
                i = 0;
                while (1) {
-                       aice_read_ctrl(AICE_READ_CTRL_BATCH_STATUS, &batch_status);
+                       int retval = aice_read_ctrl(AICE_READ_CTRL_BATCH_STATUS, &batch_status);
+                       if (retval != ERROR_OK)
+                               return retval;
 
                        if (batch_status & 0x1)
                                return ERROR_OK;
@@ -505,9 +497,9 @@ static int aice_usb_packet_append(uint8_t *out_buffer, int out_length, int in_le
 {
        uint32_t max_packet_size = AICE_OUT_PACKETS_BUFFER_SIZE;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                max_packet_size = AICE_OUT_PACK_COMMAND_SIZE;
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                max_packet_size = AICE_OUT_BATCH_COMMAND_SIZE;
        } else {
                /* AICE_COMMAND_MODE_NORMAL */
@@ -552,11 +544,10 @@ static int aice_reset_box(void)
 
 static int aice_scan_chain(uint32_t *id_codes, uint8_t *num_of_ids)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -567,9 +558,9 @@ static int aice_scan_chain(uint32_t *id_codes, uint8_t *num_of_ids)
                LOG_DEBUG("SCAN_CHAIN, length: 0x0F");
 
                /** TODO: modify receive length */
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHA);
-               if (AICE_FORMAT_DTHA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRIu32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHA);
+               if (result != AICE_FORMAT_DTHA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHA, result);
                        return ERROR_FAIL;
                }
@@ -581,7 +572,7 @@ static int aice_scan_chain(uint32_t *id_codes, uint8_t *num_of_ids)
                if (cmd_ack_code != AICE_CMD_SCAN_CHAIN) {
 
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_SCAN_CHAIN, cmd_ack_code);
                                return ERROR_FAIL;
                        }
@@ -612,10 +603,8 @@ static int aice_scan_chain(uint32_t *id_codes, uint8_t *num_of_ids)
 
 int aice_read_ctrl(uint32_t address, uint32_t *data)
 {
-       int32_t result;
-
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        aice_pack_htda(AICE_CMD_READ_CTRL, 0, address);
@@ -624,9 +613,9 @@ int aice_read_ctrl(uint32_t address, uint32_t *data)
 
        LOG_DEBUG("READ_CTRL, address: 0x%" PRIx32, address);
 
-       result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHA);
-       if (AICE_FORMAT_DTHA != result) {
-               LOG_ERROR("aice_usb_read failed (requested=%" PRIu32 ", result=%" PRId32 ")",
+       int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHA);
+       if (result != AICE_FORMAT_DTHA) {
+               LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                AICE_FORMAT_DTHA, result);
                return ERROR_FAIL;
        }
@@ -638,8 +627,8 @@ int aice_read_ctrl(uint32_t address, uint32_t *data)
        LOG_DEBUG("READ_CTRL response, data: 0x%" PRIx32, *data);
 
        if (cmd_ack_code != AICE_CMD_READ_CTRL) {
-               LOG_ERROR("aice command error (command=0x%" PRIx32 ", response=0x%" PRIx8 ")",
-                               (uint32_t)AICE_CMD_READ_CTRL, cmd_ack_code);
+               LOG_ERROR("aice command error (command=0x%x, response=0x%" PRIx8 ")",
+                               AICE_CMD_READ_CTRL, cmd_ack_code);
                return ERROR_FAIL;
        }
 
@@ -648,11 +637,9 @@ int aice_read_ctrl(uint32_t address, uint32_t *data)
 
 int aice_write_ctrl(uint32_t address, uint32_t data)
 {
-       int32_t result;
-
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdc(AICE_CMD_WRITE_CTRL, 0, address, data, AICE_LITTLE_ENDIAN);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDC,
                                AICE_FORMAT_DTHB);
@@ -664,9 +651,9 @@ int aice_write_ctrl(uint32_t address, uint32_t data)
 
        LOG_DEBUG("WRITE_CTRL, address: 0x%" PRIx32 ", data: 0x%" PRIx32, address, data);
 
-       result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHB);
-       if (AICE_FORMAT_DTHB != result) {
-               LOG_ERROR("aice_usb_read failed (requested=%" PRIu32 ", result=%" PRId32 ")",
+       int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHB);
+       if (result != AICE_FORMAT_DTHB) {
+               LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                AICE_FORMAT_DTHB, result);
                return ERROR_FAIL;
        }
@@ -678,7 +665,7 @@ int aice_write_ctrl(uint32_t address, uint32_t data)
        LOG_DEBUG("WRITE_CTRL response");
 
        if (cmd_ack_code != AICE_CMD_WRITE_CTRL) {
-               LOG_ERROR("aice command error (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+               LOG_ERROR("aice command error (command=0x%x, response=0x%" PRIx8 ")",
                                AICE_CMD_WRITE_CTRL, cmd_ack_code);
                return ERROR_FAIL;
        }
@@ -686,13 +673,12 @@ int aice_write_ctrl(uint32_t address, uint32_t data)
        return ERROR_OK;
 }
 
-int aice_read_dtr(uint8_t target_id, uint32_t *data)
+static int aice_read_dtr(uint8_t target_id, uint32_t *data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -702,9 +688,9 @@ int aice_read_dtr(uint8_t target_id, uint32_t *data)
 
                LOG_DEBUG("READ_DTR, COREID: %" PRIu8, target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
-               if (AICE_FORMAT_DTHMA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
+               if (result != AICE_FORMAT_DTHMA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMA, result);
                        return ERROR_FAIL;
                }
@@ -721,7 +707,7 @@ int aice_read_dtr(uint8_t target_id, uint32_t *data)
                } else {
 
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_READ_DTR, cmd_ack_code);
                                return ERROR_FAIL;
                        }
@@ -737,14 +723,13 @@ int aice_read_dtr(uint8_t target_id, uint32_t *data)
        return ERROR_OK;
 }
 
-int aice_read_dtr_to_buffer(uint8_t target_id, uint32_t buffer_idx)
+static int aice_read_dtr_to_buffer(uint8_t target_id, uint32_t buffer_idx)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdma(AICE_CMD_READ_DTR_TO_BUFFER, target_id, 0, buffer_idx);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMA,
                                AICE_FORMAT_DTHMB);
@@ -757,9 +742,9 @@ int aice_read_dtr_to_buffer(uint8_t target_id, uint32_t buffer_idx)
 
                LOG_DEBUG("READ_DTR_TO_BUFFER, COREID: %" PRIu8, target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")", AICE_FORMAT_DTHMB, result);
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
 
@@ -772,7 +757,7 @@ int aice_read_dtr_to_buffer(uint8_t target_id, uint32_t buffer_idx)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_READ_DTR_TO_BUFFER, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -789,14 +774,13 @@ int aice_read_dtr_to_buffer(uint8_t target_id, uint32_t buffer_idx)
        return ERROR_OK;
 }
 
-int aice_write_dtr(uint8_t target_id, uint32_t data)
+static int aice_write_dtr(uint8_t target_id, uint32_t data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdmc(AICE_CMD_T_WRITE_DTR, target_id, 0, 0, data, AICE_LITTLE_ENDIAN);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMC,
                                AICE_FORMAT_DTHMB);
@@ -809,9 +793,9 @@ int aice_write_dtr(uint8_t target_id, uint32_t data)
 
                LOG_DEBUG("WRITE_DTR, COREID: %" PRIu8 ", data: 0x%" PRIx32, target_id, data);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")", AICE_FORMAT_DTHMB, result);
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
 
@@ -825,7 +809,7 @@ int aice_write_dtr(uint8_t target_id, uint32_t data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_WRITE_DTR, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -842,14 +826,13 @@ int aice_write_dtr(uint8_t target_id, uint32_t data)
        return ERROR_OK;
 }
 
-int aice_write_dtr_from_buffer(uint8_t target_id, uint32_t buffer_idx)
+static int aice_write_dtr_from_buffer(uint8_t target_id, uint32_t buffer_idx)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdma(AICE_CMD_WRITE_DTR_FROM_BUFFER, target_id, 0, buffer_idx);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMA,
                                AICE_FORMAT_DTHMB);
@@ -862,9 +845,9 @@ int aice_write_dtr_from_buffer(uint8_t target_id, uint32_t buffer_idx)
 
                LOG_DEBUG("WRITE_DTR_FROM_BUFFER, COREID: %" PRIu8 "", target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")", AICE_FORMAT_DTHMB, result);
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
 
@@ -877,7 +860,7 @@ int aice_write_dtr_from_buffer(uint8_t target_id, uint32_t buffer_idx)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_WRITE_DTR_FROM_BUFFER, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -894,13 +877,12 @@ int aice_write_dtr_from_buffer(uint8_t target_id, uint32_t buffer_idx)
        return ERROR_OK;
 }
 
-int aice_read_misc(uint8_t target_id, uint32_t address, uint32_t *data)
+static int aice_read_misc(uint8_t target_id, uint32_t address, uint32_t *data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -910,9 +892,9 @@ int aice_read_misc(uint8_t target_id, uint32_t address, uint32_t *data)
 
                LOG_DEBUG("READ_MISC, COREID: %" PRIu8 ", address: 0x%" PRIx32, target_id, address);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
-               if (AICE_FORMAT_DTHMA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
+               if (result != AICE_FORMAT_DTHMA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMA, result);
                        return ERROR_AICE_DISCONNECT;
                }
@@ -928,7 +910,7 @@ int aice_read_misc(uint8_t target_id, uint32_t address, uint32_t *data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_READ_MISC, cmd_ack_code);
                                return ERROR_FAIL;
                        }
@@ -944,14 +926,13 @@ int aice_read_misc(uint8_t target_id, uint32_t address, uint32_t *data)
        return ERROR_OK;
 }
 
-int aice_write_misc(uint8_t target_id, uint32_t address, uint32_t data)
+static int aice_write_misc(uint8_t target_id, uint32_t address, uint32_t data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdmc(AICE_CMD_T_WRITE_MISC, target_id, 0, address, data,
                                AICE_LITTLE_ENDIAN);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMC,
@@ -967,9 +948,9 @@ int aice_write_misc(uint8_t target_id, uint32_t address, uint32_t data)
                LOG_DEBUG("WRITE_MISC, COREID: %" PRIu8 ", address: 0x%" PRIx32 ", data: 0x%" PRIx32,
                                target_id, address, data);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
@@ -984,7 +965,7 @@ int aice_write_misc(uint8_t target_id, uint32_t address, uint32_t data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_WRITE_MISC, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1001,13 +982,12 @@ int aice_write_misc(uint8_t target_id, uint32_t address, uint32_t data)
        return ERROR_OK;
 }
 
-int aice_read_edmsr(uint8_t target_id, uint32_t address, uint32_t *data)
+static int aice_read_edmsr(uint8_t target_id, uint32_t address, uint32_t *data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -1017,9 +997,9 @@ int aice_read_edmsr(uint8_t target_id, uint32_t address, uint32_t *data)
 
                LOG_DEBUG("READ_EDMSR, COREID: %" PRIu8 ", address: 0x%" PRIx32, target_id, address);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
-               if (AICE_FORMAT_DTHMA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
+               if (result != AICE_FORMAT_DTHMA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMA, result);
                        return ERROR_FAIL;
                }
@@ -1035,7 +1015,7 @@ int aice_read_edmsr(uint8_t target_id, uint32_t address, uint32_t *data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_READ_EDMSR, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1052,14 +1032,13 @@ int aice_read_edmsr(uint8_t target_id, uint32_t address, uint32_t *data)
        return ERROR_OK;
 }
 
-int aice_write_edmsr(uint8_t target_id, uint32_t address, uint32_t data)
+static int aice_write_edmsr(uint8_t target_id, uint32_t address, uint32_t data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdmc(AICE_CMD_T_WRITE_EDMSR, target_id, 0, address, data,
                                AICE_LITTLE_ENDIAN);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMC,
@@ -1075,9 +1054,9 @@ int aice_write_edmsr(uint8_t target_id, uint32_t address, uint32_t data)
                LOG_DEBUG("WRITE_EDMSR, COREID: %" PRIu8 ", address: 0x%" PRIx32 ", data: 0x%" PRIx32,
                                target_id, address, data);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
@@ -1092,7 +1071,7 @@ int aice_write_edmsr(uint8_t target_id, uint32_t address, uint32_t data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_WRITE_EDMSR, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1126,7 +1105,6 @@ static int aice_switch_to_big_endian(uint32_t *word, uint8_t num_of_words)
 
 static int aice_write_dim(uint8_t target_id, uint32_t *word, uint8_t num_of_words)
 {
-       int32_t result;
        uint32_t big_endian_word[4];
        int retry_times = 0;
 
@@ -1134,9 +1112,9 @@ static int aice_write_dim(uint8_t target_id, uint32_t *word, uint8_t num_of_word
        memcpy(big_endian_word, word, sizeof(big_endian_word));
        aice_switch_to_big_endian(big_endian_word, num_of_words);
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdmc_multiple_data(AICE_CMD_T_WRITE_DIM, target_id,
                                num_of_words - 1, 0, big_endian_word, num_of_words,
                                AICE_LITTLE_ENDIAN);
@@ -1159,9 +1137,9 @@ static int aice_write_dim(uint8_t target_id, uint32_t *word, uint8_t num_of_word
                                big_endian_word[2],
                                big_endian_word[3]);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")", AICE_FORMAT_DTHMB, result);
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
 
@@ -1176,8 +1154,7 @@ static int aice_write_dim(uint8_t target_id, uint32_t *word, uint8_t num_of_word
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8
-                                               ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_WRITE_DIM, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1196,12 +1173,11 @@ static int aice_write_dim(uint8_t target_id, uint32_t *word, uint8_t num_of_word
 
 static int aice_do_execute(uint8_t target_id)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdmc(AICE_CMD_T_EXECUTE, target_id, 0, 0, 0, AICE_LITTLE_ENDIAN);
                return aice_usb_packet_append(usb_out_buffer,
                                AICE_FORMAT_HTDMC,
@@ -1215,9 +1191,9 @@ static int aice_do_execute(uint8_t target_id)
 
                LOG_DEBUG("EXECUTE, COREID: %" PRIu8 "", target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
@@ -1232,7 +1208,7 @@ static int aice_do_execute(uint8_t target_id)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_EXECUTE, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1249,9 +1225,8 @@ static int aice_do_execute(uint8_t target_id)
        return ERROR_OK;
 }
 
-int aice_write_mem_b(uint8_t target_id, uint32_t address, uint32_t data)
+static int aice_write_mem_b(uint8_t target_id, uint32_t address, uint32_t data)
 {
-       int32_t result;
        int retry_times = 0;
 
        LOG_DEBUG("WRITE_MEM_B, COREID: %" PRIu8 ", ADDRESS %08" PRIx32 "  VALUE %08" PRIx32,
@@ -1259,8 +1234,8 @@ int aice_write_mem_b(uint8_t target_id, uint32_t address, uint32_t data)
                        address,
                        data);
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode)) {
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH)) {
                aice_pack_htdmd(AICE_CMD_T_WRITE_MEM_B, target_id, 0, address,
                                data & 0x000000FF, data_endian);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMD,
@@ -1271,10 +1246,9 @@ int aice_write_mem_b(uint8_t target_id, uint32_t address, uint32_t data)
                                        address, data & 0x000000FF, data_endian);
                        aice_usb_write(usb_out_buffer, AICE_FORMAT_HTDMD);
 
-                       result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-                       if (AICE_FORMAT_DTHMB != result) {
-                               LOG_ERROR("aice_usb_read failed (requested=%" PRId32
-                                               ", result=%" PRId32 ")", AICE_FORMAT_DTHMB, result);
+                       int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+                       if (result != AICE_FORMAT_DTHMB) {
+                               LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
                                return ERROR_FAIL;
                        }
 
@@ -1287,7 +1261,7 @@ int aice_write_mem_b(uint8_t target_id, uint32_t address, uint32_t data)
                                break;
                        } else {
                                if (retry_times > aice_max_retry_times) {
-                                       LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                                       LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                        AICE_CMD_T_WRITE_MEM_B, cmd_ack_code);
 
                                        return ERROR_FAIL;
@@ -1305,9 +1279,8 @@ int aice_write_mem_b(uint8_t target_id, uint32_t address, uint32_t data)
        return ERROR_OK;
 }
 
-int aice_write_mem_h(uint8_t target_id, uint32_t address, uint32_t data)
+static int aice_write_mem_h(uint8_t target_id, uint32_t address, uint32_t data)
 {
-       int32_t result;
        int retry_times = 0;
 
        LOG_DEBUG("WRITE_MEM_H, COREID: %" PRIu8 ", ADDRESS %08" PRIx32 "  VALUE %08" PRIx32,
@@ -1315,8 +1288,8 @@ int aice_write_mem_h(uint8_t target_id, uint32_t address, uint32_t data)
                        address,
                        data);
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode)) {
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH)) {
                aice_pack_htdmd(AICE_CMD_T_WRITE_MEM_H, target_id, 0,
                                (address >> 1) & 0x7FFFFFFF, data & 0x0000FFFF, data_endian);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMD,
@@ -1327,9 +1300,9 @@ int aice_write_mem_h(uint8_t target_id, uint32_t address, uint32_t data)
                                        (address >> 1) & 0x7FFFFFFF, data & 0x0000FFFF, data_endian);
                        aice_usb_write(usb_out_buffer, AICE_FORMAT_HTDMD);
 
-                       result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-                       if (AICE_FORMAT_DTHMB != result) {
-                               LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+                       int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+                       if (result != AICE_FORMAT_DTHMB) {
+                               LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                                AICE_FORMAT_DTHMB, result);
                                return ERROR_FAIL;
                        }
@@ -1343,7 +1316,7 @@ int aice_write_mem_h(uint8_t target_id, uint32_t address, uint32_t data)
                                break;
                        } else {
                                if (retry_times > aice_max_retry_times) {
-                                       LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                                       LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                        AICE_CMD_T_WRITE_MEM_H, cmd_ack_code);
 
                                        return ERROR_FAIL;
@@ -1361,9 +1334,8 @@ int aice_write_mem_h(uint8_t target_id, uint32_t address, uint32_t data)
        return ERROR_OK;
 }
 
-int aice_write_mem(uint8_t target_id, uint32_t address, uint32_t data)
+static int aice_write_mem(uint8_t target_id, uint32_t address, uint32_t data)
 {
-       int32_t result;
        int retry_times = 0;
 
        LOG_DEBUG("WRITE_MEM, COREID: %" PRIu8 ", ADDRESS %08" PRIx32 "  VALUE %08" PRIx32,
@@ -1371,8 +1343,8 @@ int aice_write_mem(uint8_t target_id, uint32_t address, uint32_t data)
                        address,
                        data);
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode)) {
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH)) {
                aice_pack_htdmd(AICE_CMD_T_WRITE_MEM, target_id, 0,
                                (address >> 2) & 0x3FFFFFFF, data, data_endian);
                return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMD,
@@ -1383,9 +1355,9 @@ int aice_write_mem(uint8_t target_id, uint32_t address, uint32_t data)
                                        (address >> 2) & 0x3FFFFFFF, data, data_endian);
                        aice_usb_write(usb_out_buffer, AICE_FORMAT_HTDMD);
 
-                       result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-                       if (AICE_FORMAT_DTHMB != result) {
-                               LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+                       int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+                       if (result != AICE_FORMAT_DTHMB) {
+                               LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                                AICE_FORMAT_DTHMB, result);
                                return ERROR_FAIL;
                        }
@@ -1399,7 +1371,7 @@ int aice_write_mem(uint8_t target_id, uint32_t address, uint32_t data)
                                break;
                        } else {
                                if (retry_times > aice_max_retry_times) {
-                                       LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                                       LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                        AICE_CMD_T_WRITE_MEM, cmd_ack_code);
 
                                        return ERROR_FAIL;
@@ -1417,13 +1389,12 @@ int aice_write_mem(uint8_t target_id, uint32_t address, uint32_t data)
        return ERROR_OK;
 }
 
-int aice_fastread_mem(uint8_t target_id, uint8_t *word, uint32_t num_of_words)
+static int aice_fastread_mem(uint8_t target_id, uint8_t *word, uint32_t num_of_words)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -1434,9 +1405,9 @@ int aice_fastread_mem(uint8_t target_id, uint8_t *word, uint32_t num_of_words)
                LOG_DEBUG("FASTREAD_MEM, COREID: %" PRIu8 ", # of DATA %08" PRIx32,
                                target_id, num_of_words);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA + (num_of_words - 1) * 4);
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA + (num_of_words - 1) * 4);
                if (result < 0) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+                       LOG_ERROR("aice_usb_read failed (requested=%" PRIu32 ", result=%d)",
                                        AICE_FORMAT_DTHMA + (num_of_words - 1) * 4, result);
                        return ERROR_FAIL;
                }
@@ -1451,7 +1422,7 @@ int aice_fastread_mem(uint8_t target_id, uint8_t *word, uint32_t num_of_words)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_FASTREAD_MEM, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1468,14 +1439,13 @@ int aice_fastread_mem(uint8_t target_id, uint8_t *word, uint32_t num_of_words)
        return ERROR_OK;
 }
 
-int aice_fastwrite_mem(uint8_t target_id, const uint8_t *word, uint32_t num_of_words)
+static int aice_fastwrite_mem(uint8_t target_id, const uint8_t *word, uint32_t num_of_words)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+       if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
                aice_usb_packet_flush();
-       } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+       } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
                aice_pack_htdmd_multiple_data(AICE_CMD_T_FASTWRITE_MEM, target_id,
                                num_of_words - 1, 0, word, data_endian);
                return aice_usb_packet_append(usb_out_buffer,
@@ -1492,9 +1462,9 @@ int aice_fastwrite_mem(uint8_t target_id, const uint8_t *word, uint32_t num_of_w
                LOG_DEBUG("FASTWRITE_MEM, COREID: %" PRIu8 ", # of DATA %08" PRIx32,
                                target_id, num_of_words);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
@@ -1508,7 +1478,7 @@ int aice_fastwrite_mem(uint8_t target_id, const uint8_t *word, uint32_t num_of_w
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_FASTWRITE_MEM, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1525,13 +1495,12 @@ int aice_fastwrite_mem(uint8_t target_id, const uint8_t *word, uint32_t num_of_w
        return ERROR_OK;
 }
 
-int aice_read_mem_b(uint8_t target_id, uint32_t address, uint32_t *data)
+static int aice_read_mem_b(uint8_t target_id, uint32_t address, uint32_t *data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -1541,9 +1510,9 @@ int aice_read_mem_b(uint8_t target_id, uint32_t address, uint32_t *data)
 
                LOG_DEBUG("READ_MEM_B, COREID: %" PRIu8 "", target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
-               if (AICE_FORMAT_DTHMA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
+               if (result != AICE_FORMAT_DTHMA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMA, result);
                        return ERROR_FAIL;
                }
@@ -1559,7 +1528,7 @@ int aice_read_mem_b(uint8_t target_id, uint32_t address, uint32_t *data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_READ_MEM_B, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1576,13 +1545,12 @@ int aice_read_mem_b(uint8_t target_id, uint32_t address, uint32_t *data)
        return ERROR_OK;
 }
 
-int aice_read_mem_h(uint8_t target_id, uint32_t address, uint32_t *data)
+static int aice_read_mem_h(uint8_t target_id, uint32_t address, uint32_t *data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -1592,9 +1560,9 @@ int aice_read_mem_h(uint8_t target_id, uint32_t address, uint32_t *data)
 
                LOG_DEBUG("READ_MEM_H, CORE_ID: %" PRIu8 "", target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
-               if (AICE_FORMAT_DTHMA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
+               if (result != AICE_FORMAT_DTHMA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMA, result);
                        return ERROR_FAIL;
                }
@@ -1610,7 +1578,7 @@ int aice_read_mem_h(uint8_t target_id, uint32_t address, uint32_t *data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_READ_MEM_H, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1627,13 +1595,12 @@ int aice_read_mem_h(uint8_t target_id, uint32_t address, uint32_t *data)
        return ERROR_OK;
 }
 
-int aice_read_mem(uint8_t target_id, uint32_t address, uint32_t *data)
+static int aice_read_mem(uint8_t target_id, uint32_t address, uint32_t *data)
 {
-       int32_t result;
        int retry_times = 0;
 
-       if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
-               (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+       if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+               (aice_command_mode == AICE_COMMAND_MODE_BATCH))
                aice_usb_packet_flush();
 
        do {
@@ -1644,9 +1611,9 @@ int aice_read_mem(uint8_t target_id, uint32_t address, uint32_t *data)
 
                LOG_DEBUG("READ_MEM, COREID: %" PRIu8 "", target_id);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
-               if (AICE_FORMAT_DTHMA != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
+               if (result != AICE_FORMAT_DTHMA) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMA, result);
                        return ERROR_FAIL;
                }
@@ -1662,7 +1629,7 @@ int aice_read_mem(uint8_t target_id, uint32_t address, uint32_t *data)
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_T_READ_MEM, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1679,9 +1646,8 @@ int aice_read_mem(uint8_t target_id, uint32_t address, uint32_t *data)
        return ERROR_OK;
 }
 
-int aice_batch_buffer_read(uint8_t buf_index, uint32_t *word, uint32_t num_of_words)
+static int aice_batch_buffer_read(uint8_t buf_index, uint32_t *word, uint32_t num_of_words)
 {
-       int32_t result;
        int retry_times = 0;
 
        do {
@@ -1691,9 +1657,9 @@ int aice_batch_buffer_read(uint8_t buf_index, uint32_t *word, uint32_t num_of_wo
 
                LOG_DEBUG("BATCH_BUFFER_READ, # of DATA %08" PRIx32, num_of_words);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA + (num_of_words - 1) * 4);
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA + (num_of_words - 1) * 4);
                if (result < 0) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+                       LOG_ERROR("aice_usb_read failed (requested=%" PRIu32 ", result=%d)",
                                        AICE_FORMAT_DTHMA + (num_of_words - 1) * 4, result);
                        return ERROR_FAIL;
                }
@@ -1708,7 +1674,7 @@ int aice_batch_buffer_read(uint8_t buf_index, uint32_t *word, uint32_t num_of_wo
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_BATCH_BUFFER_READ, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1727,7 +1693,6 @@ int aice_batch_buffer_read(uint8_t buf_index, uint32_t *word, uint32_t num_of_wo
 
 int aice_batch_buffer_write(uint8_t buf_index, const uint8_t *word, uint32_t num_of_words)
 {
-       int32_t result;
        int retry_times = 0;
 
        if (num_of_words == 0)
@@ -1745,9 +1710,9 @@ int aice_batch_buffer_write(uint8_t buf_index, const uint8_t *word, uint32_t num
 
                LOG_DEBUG("BATCH_BUFFER_WRITE, # of DATA %08" PRIx32, num_of_words);
 
-               result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
-               if (AICE_FORMAT_DTHMB != result) {
-                       LOG_ERROR("aice_usb_read failed (requested=%" PRId32 ", result=%" PRId32 ")",
+               int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
+               if (result != AICE_FORMAT_DTHMB) {
+                       LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
                                        AICE_FORMAT_DTHMB, result);
                        return ERROR_FAIL;
                }
@@ -1761,7 +1726,7 @@ int aice_batch_buffer_write(uint8_t buf_index, const uint8_t *word, uint32_t num
                        break;
                } else {
                        if (retry_times > aice_max_retry_times) {
-                               LOG_ERROR("aice command timeout (command=0x%" PRIx8 ", response=0x%" PRIx8 ")",
+                               LOG_ERROR("aice command timeout (command=0x%x, response=0x%" PRIx8 ")",
                                                AICE_CMD_BATCH_BUFFER_WRITE, cmd_ack_code);
 
                                return ERROR_FAIL;
@@ -1784,7 +1749,7 @@ int aice_batch_buffer_write(uint8_t buf_index, const uint8_t *word, uint32_t num
 typedef int (*read_mem_func_t)(uint32_t coreid, uint32_t address, uint32_t *data);
 typedef int (*write_mem_func_t)(uint32_t coreid, uint32_t address, uint32_t data);
 
-struct aice_nds32_info core_info[AICE_MAX_NUM_CORE];
+static struct aice_nds32_info core_info[AICE_MAX_NUM_CORE];
 static uint8_t total_num_of_core;
 
 static char *custom_srst_script;
@@ -1797,8 +1762,8 @@ static int aice_write_reg(uint32_t coreid, uint32_t num, uint32_t val);
 
 static int check_suppressed_exception(uint32_t coreid, uint32_t dbger_value)
 {
-       uint32_t ir4_value;
-       uint32_t ir6_value;
+       uint32_t ir4_value = 0;
+       uint32_t ir6_value = 0;
        /* the default value of handling_suppressed_exception is false */
        static bool handling_suppressed_exception;
 
@@ -1852,15 +1817,15 @@ static int check_privilege(uint32_t coreid, uint32_t dbger_value)
 static int aice_check_dbger(uint32_t coreid, uint32_t expect_status)
 {
        uint32_t i = 0;
-       uint32_t value_dbger;
+       uint32_t value_dbger = 0;
 
        while (1) {
                aice_read_misc(coreid, NDS_EDM_MISC_DBGER, &value_dbger);
 
                if ((value_dbger & expect_status) == expect_status) {
-                       if (ERROR_OK != check_suppressed_exception(coreid, value_dbger))
+                       if (check_suppressed_exception(coreid, value_dbger) != ERROR_OK)
                                return ERROR_FAIL;
-                       if (ERROR_OK != check_privilege(coreid, value_dbger))
+                       if (check_privilege(coreid, value_dbger) != ERROR_OK)
                                return ERROR_FAIL;
                        return ERROR_OK;
                }
@@ -1918,18 +1883,18 @@ static int aice_read_reg(uint32_t coreid, uint32_t num, uint32_t *val)
 
        uint32_t instructions[4]; /** execute instructions in DIM */
 
-       if (NDS32_REG_TYPE_GPR == nds32_reg_type(num)) { /* general registers */
+       if (nds32_reg_type(num) == NDS32_REG_TYPE_GPR) { /* general registers */
                instructions[0] = MTSR_DTR(num);
                instructions[1] = DSB;
                instructions[2] = NOP;
                instructions[3] = BEQ_MINUS_12;
-       } else if (NDS32_REG_TYPE_SPR == nds32_reg_type(num)) { /* user special registers */
+       } else if (nds32_reg_type(num) == NDS32_REG_TYPE_SPR) { /* user special registers */
                instructions[0] = MFUSR_G0(0, nds32_reg_sr_index(num));
                instructions[1] = MTSR_DTR(0);
                instructions[2] = DSB;
                instructions[3] = BEQ_MINUS_12;
-       } else if (NDS32_REG_TYPE_AUMR == nds32_reg_type(num)) { /* audio registers */
-               if ((CB_CTL <= num) && (num <= CBE3)) {
+       } else if (nds32_reg_type(num) == NDS32_REG_TYPE_AUMR) { /* audio registers */
+               if ((num >= CB_CTL) && (num <= CBE3)) {
                        instructions[0] = AMFAR2(0, nds32_reg_sr_index(num));
                        instructions[1] = MTSR_DTR(0);
                        instructions[2] = DSB;
@@ -1940,24 +1905,24 @@ static int aice_read_reg(uint32_t coreid, uint32_t num, uint32_t *val)
                        instructions[2] = DSB;
                        instructions[3] = BEQ_MINUS_12;
                }
-       } else if (NDS32_REG_TYPE_FPU == nds32_reg_type(num)) { /* fpu registers */
-               if (FPCSR == num) {
+       } else if (nds32_reg_type(num) == NDS32_REG_TYPE_FPU) { /* fpu registers */
+               if (num == FPCSR) {
                        instructions[0] = FMFCSR;
                        instructions[1] = MTSR_DTR(0);
                        instructions[2] = DSB;
                        instructions[3] = BEQ_MINUS_12;
-               } else if (FPCFG == num) {
+               } else if (num == FPCFG) {
                        instructions[0] = FMFCFG;
                        instructions[1] = MTSR_DTR(0);
                        instructions[2] = DSB;
                        instructions[3] = BEQ_MINUS_12;
                } else {
-                       if (FS0 <= num && num <= FS31) { /* single precision */
+                       if (num >= FS0 && num <= FS31) { /* single precision */
                                instructions[0] = FMFSR(0, nds32_reg_sr_index(num));
                                instructions[1] = MTSR_DTR(0);
                                instructions[2] = DSB;
                                instructions[3] = BEQ_MINUS_12;
-                       } else if (FD0 <= num && num <= FD31) { /* double precision */
+                       } else if (num >= FD0 && num <= FD31) { /* double precision */
                                instructions[0] = FMFDR(0, nds32_reg_sr_index(num));
                                instructions[1] = MTSR_DTR(0);
                                instructions[2] = DSB;
@@ -1973,7 +1938,7 @@ static int aice_read_reg(uint32_t coreid, uint32_t num, uint32_t *val)
 
        aice_execute_dim(coreid, instructions, 4);
 
-       uint32_t value_edmsw;
+       uint32_t value_edmsw = 0;
        aice_read_edmsr(coreid, NDS_EDM_SR_EDMSW, &value_edmsw);
        if (value_edmsw & NDS_EDMSW_WDV)
                aice_read_dtr(coreid, val);
@@ -2006,7 +1971,7 @@ static int aice_usb_read_reg(uint32_t coreid, uint32_t num, uint32_t *val)
        } else if ((core_info[coreid].target_dtr_valid == true) && (num == DR43)) {
                *val = core_info[coreid].target_dtr_backup;
        } else {
-               if (ERROR_OK != aice_read_reg(coreid, num, val))
+               if (aice_read_reg(coreid, num, val) != ERROR_OK)
                        *val = 0xBBADBEEF;
        }
 
@@ -2018,7 +1983,7 @@ static int aice_write_reg(uint32_t coreid, uint32_t num, uint32_t val)
        LOG_DEBUG("aice_write_reg, reg_no: 0x%08" PRIx32 ", value: 0x%08" PRIx32, num, val);
 
        uint32_t instructions[4]; /** execute instructions in DIM */
-       uint32_t value_edmsw;
+       uint32_t value_edmsw = 0;
 
        aice_write_dtr(coreid, val);
        aice_read_edmsr(coreid, NDS_EDM_SR_EDMSW, &value_edmsw);
@@ -2027,18 +1992,18 @@ static int aice_write_reg(uint32_t coreid, uint32_t num, uint32_t val)
                return ERROR_FAIL;
        }
 
-       if (NDS32_REG_TYPE_GPR == nds32_reg_type(num)) { /* general registers */
+       if (nds32_reg_type(num) == NDS32_REG_TYPE_GPR) { /* general registers */
                instructions[0] = MFSR_DTR(num);
                instructions[1] = DSB;
                instructions[2] = NOP;
                instructions[3] = BEQ_MINUS_12;
-       } else if (NDS32_REG_TYPE_SPR == nds32_reg_type(num)) { /* user special registers */
+       } else if (nds32_reg_type(num) == NDS32_REG_TYPE_SPR) { /* user special registers */
                instructions[0] = MFSR_DTR(0);
                instructions[1] = MTUSR_G0(0, nds32_reg_sr_index(num));
                instructions[2] = DSB;
                instructions[3] = BEQ_MINUS_12;
-       } else if (NDS32_REG_TYPE_AUMR == nds32_reg_type(num)) { /* audio registers */
-               if ((CB_CTL <= num) && (num <= CBE3)) {
+       } else if (nds32_reg_type(num) == NDS32_REG_TYPE_AUMR) { /* audio registers */
+               if ((num >= CB_CTL) && (num <= CBE3)) {
                        instructions[0] = MFSR_DTR(0);
                        instructions[1] = AMTAR2(0, nds32_reg_sr_index(num));
                        instructions[2] = DSB;
@@ -2049,21 +2014,21 @@ static int aice_write_reg(uint32_t coreid, uint32_t num, uint32_t val)
                        instructions[2] = DSB;
                        instructions[3] = BEQ_MINUS_12;
                }
-       } else if (NDS32_REG_TYPE_FPU == nds32_reg_type(num)) { /* fpu registers */
-               if (FPCSR == num) {
+       } else if (nds32_reg_type(num) == NDS32_REG_TYPE_FPU) { /* fpu registers */
+               if (num == FPCSR) {
                        instructions[0] = MFSR_DTR(0);
                        instructions[1] = FMTCSR;
                        instructions[2] = DSB;
                        instructions[3] = BEQ_MINUS_12;
-               } else if (FPCFG == num) {
+               } else if (num == FPCFG) {
                        /* FPCFG is readonly */
                } else {
-                       if (FS0 <= num && num <= FS31) { /* single precision */
+                       if (num >= FS0 && num <= FS31) { /* single precision */
                                instructions[0] = MFSR_DTR(0);
                                instructions[1] = FMTSR(0, nds32_reg_sr_index(num));
                                instructions[2] = DSB;
                                instructions[3] = BEQ_MINUS_12;
-                       } else if (FD0 <= num && num <= FD31) { /* double precision */
+                       } else if (num >= FD0 && num <= FD31) { /* double precision */
                                instructions[0] = MFSR_DTR(0);
                                instructions[1] = FMTDR(0, nds32_reg_sr_index(num));
                                instructions[2] = DSB;
@@ -2109,7 +2074,7 @@ static int aice_usb_open(struct aice_port_param_s *param)
        const uint16_t pids[] = { param->pid, 0 };
        struct libusb_device_handle *devh;
 
-       if (jtag_libusb_open(vids, pids, NULL, &devh) != ERROR_OK)
+       if (jtag_libusb_open(vids, pids, &devh, NULL) != ERROR_OK)
                return ERROR_FAIL;
 
        /* BE ***VERY CAREFUL*** ABOUT MAKING CHANGES IN THIS
@@ -2133,13 +2098,13 @@ static int aice_usb_open(struct aice_port_param_s *param)
        /* reopen jlink after usb_reset
         * on win32 this may take a second or two to re-enumerate */
        int retval;
-       while ((retval = jtag_libusb_open(vids, pids, NULL, &devh)) != ERROR_OK) {
+       while ((retval = jtag_libusb_open(vids, pids, &devh, NULL)) != ERROR_OK) {
                usleep(1000);
                timeout--;
                if (!timeout)
                        break;
        }
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return ERROR_FAIL;
 #endif
 
@@ -2169,7 +2134,7 @@ static int aice_usb_read_reg_64(uint32_t coreid, uint32_t num, uint64_t *val)
        uint32_t value;
        uint32_t high_value;
 
-       if (ERROR_OK != aice_read_reg(coreid, num, &value))
+       if (aice_read_reg(coreid, num, &value) != ERROR_OK)
                value = 0xBBADBEEF;
 
        aice_read_reg(coreid, R1, &high_value);
@@ -2238,24 +2203,24 @@ static int aice_execute_custom_script(const char *script)
        bool set_op;
 
        script_fd = fopen(script, "r");
-       if (script_fd == NULL) {
+       if (!script_fd) {
                return ERROR_FAIL;
        } else {
-               while (fgets(line_buffer, LINE_BUFFER_SIZE, script_fd) != NULL) {
+               while (fgets(line_buffer, LINE_BUFFER_SIZE, script_fd)) {
                        /* execute operations */
                        set_op = false;
                        op_str = strstr(line_buffer, "set");
-                       if (op_str != NULL) {
+                       if (op_str) {
                                set_op = true;
                                goto get_reset_type;
                        }
 
                        op_str = strstr(line_buffer, "clear");
-                       if (op_str == NULL)
+                       if (!op_str)
                                continue;
 get_reset_type:
                        reset_str = strstr(op_str, "srst");
-                       if (reset_str != NULL) {
+                       if (reset_str) {
                                if (set_op)
                                        write_ctrl_value = AICE_CUSTOM_DELAY_SET_SRST;
                                else
@@ -2263,7 +2228,7 @@ get_reset_type:
                                goto get_delay;
                        }
                        reset_str = strstr(op_str, "dbgi");
-                       if (reset_str != NULL) {
+                       if (reset_str) {
                                if (set_op)
                                        write_ctrl_value = AICE_CUSTOM_DELAY_SET_DBGI;
                                else
@@ -2271,7 +2236,7 @@ get_reset_type:
                                goto get_delay;
                        }
                        reset_str = strstr(op_str, "trst");
-                       if (reset_str != NULL) {
+                       if (reset_str) {
                                if (set_op)
                                        write_ctrl_value = AICE_CUSTOM_DELAY_SET_TRST;
                                else
@@ -2447,7 +2412,7 @@ static int aice_backup_tmp_registers(uint32_t coreid)
        LOG_DEBUG("backup_tmp_registers -");
 
        /* backup target DTR first(if the target DTR is valid) */
-       uint32_t value_edmsw;
+       uint32_t value_edmsw = 0;
        aice_read_edmsr(coreid, NDS_EDM_SR_EDMSW, &value_edmsw);
        core_info[coreid].edmsw_backup = value_edmsw;
        if (value_edmsw & 0x1) { /* EDMSW.WDV == 1 */
@@ -2526,10 +2491,10 @@ static int aice_restore_tmp_registers(uint32_t coreid)
 
 static int aice_open_device(struct aice_port_param_s *param)
 {
-       if (ERROR_OK != aice_usb_open(param))
+       if (aice_usb_open(param) != ERROR_OK)
                return ERROR_FAIL;
 
-       if (ERROR_FAIL == aice_get_version_info()) {
+       if (aice_get_version_info() == ERROR_FAIL) {
                LOG_ERROR("Cannot get AICE version!");
                return ERROR_FAIL;
        }
@@ -2537,7 +2502,7 @@ static int aice_open_device(struct aice_port_param_s *param)
        LOG_INFO("AICE initialization started");
 
        /* attempt to reset Andes EDM */
-       if (ERROR_FAIL == aice_reset_box()) {
+       if (aice_reset_box() == ERROR_FAIL) {
                LOG_ERROR("Cannot initial AICE box!");
                return ERROR_FAIL;
        }
@@ -2549,7 +2514,7 @@ static int aice_usb_set_jtag_clock(uint32_t a_clock)
 {
        jtag_clock = a_clock;
 
-       if (ERROR_OK != aice_usb_set_clock(a_clock)) {
+       if (aice_usb_set_clock(a_clock) != ERROR_OK) {
                LOG_ERROR("Cannot set AICE JTAG clock!");
                return ERROR_FAIL;
        }
@@ -2561,15 +2526,9 @@ static int aice_usb_close(void)
 {
        jtag_libusb_close(aice_handler.usb_handle);
 
-       if (custom_srst_script)
-               free(custom_srst_script);
-
-       if (custom_trst_script)
-               free(custom_trst_script);
-
-       if (custom_restart_script)
-               free(custom_restart_script);
-
+       free(custom_srst_script);
+       free(custom_trst_script);
+       free(custom_restart_script);
        return ERROR_OK;
 }
 
@@ -2587,7 +2546,7 @@ static int aice_usb_idcode(uint32_t *idcode, uint8_t *num_of_idcode)
        int retval;
 
        retval = aice_scan_chain(idcode, num_of_idcode);
-       if (ERROR_OK == retval) {
+       if (retval == ERROR_OK) {
                for (int i = 0; i < *num_of_idcode; i++) {
                        aice_core_init(i);
                        aice_edm_init(i);
@@ -2614,13 +2573,13 @@ static int aice_usb_halt(uint32_t coreid)
        aice_init_edm_registers(coreid, false);
 
        /** Clear EDM_CTL.DBGIM & EDM_CTL.DBGACKM */
-       uint32_t edm_ctl_value;
+       uint32_t edm_ctl_value = 0;
        aice_read_edmsr(coreid, NDS_EDM_SR_EDM_CTL, &edm_ctl_value);
        if (edm_ctl_value & 0x3)
                aice_write_edmsr(coreid, NDS_EDM_SR_EDM_CTL, edm_ctl_value & ~(0x3));
 
-       uint32_t dbger;
-       uint32_t acc_ctl_value;
+       uint32_t dbger = 0;
+       uint32_t acc_ctl_value = 0;
 
        core_info[coreid].debug_under_dex_on = false;
        aice_read_misc(coreid, NDS_EDM_MISC_DBGER, &dbger);
@@ -2656,12 +2615,12 @@ static int aice_usb_halt(uint32_t coreid)
 
        if (core_info[coreid].debug_under_dex_on) {
                if (core_info[coreid].dex_use_psw_on == false) {
-                       /* under debug 'debug mode', force $psw to 'debug mode' bahavior */
+                       /* under debug 'debug mode', force $psw to 'debug mode' behavior */
                        /* !!!NOTICE!!! this is workaround for debug 'debug mode'.
                         * it is only for debugging 'debug exception handler' purpose.
                         * after openocd detaches from target, target behavior is
                         * undefined. */
-                       uint32_t ir0_value;
+                       uint32_t ir0_value = 0;
                        uint32_t debug_mode_ir0_value;
                        aice_read_reg(coreid, IR0, &ir0_value);
                        debug_mode_ir0_value = ir0_value | 0x408; /* turn on DEX, set POM = 1 */
@@ -2688,7 +2647,7 @@ static int aice_usb_state(uint32_t coreid, enum aice_target_state_s *state)
 
        int result = aice_read_misc(coreid, NDS_EDM_MISC_DBGER, &dbger_value);
 
-       if (ERROR_AICE_TIMEOUT == result) {
+       if (result == ERROR_AICE_TIMEOUT) {
                if (aice_read_ctrl(AICE_READ_CTRL_GET_ICE_STATE, &ice_state) != ERROR_OK) {
                        LOG_ERROR("<-- AICE ERROR! AICE is unplugged. -->");
                        return ERROR_FAIL;
@@ -2700,7 +2659,7 @@ static int aice_usb_state(uint32_t coreid, enum aice_target_state_s *state)
                } else {
                        return ERROR_FAIL;
                }
-       } else if (ERROR_AICE_DISCONNECT == result) {
+       } else if (result == ERROR_AICE_DISCONNECT) {
                LOG_ERROR("<-- AICE ERROR! AICE is unplugged. -->");
                return ERROR_FAIL;
        }
@@ -2734,7 +2693,7 @@ static int aice_usb_state(uint32_t coreid, enum aice_target_state_s *state)
                /* Clear CRST */
                aice_write_misc(coreid, NDS_EDM_MISC_DBGER, NDS_DBGER_CRST);
        } else if ((dbger_value & NDS_DBGER_DEX) == NDS_DBGER_DEX) {
-               if (AICE_TARGET_RUNNING == core_info[coreid].core_state) {
+               if (core_info[coreid].core_state == AICE_TARGET_RUNNING) {
                        /* enter debug mode, init EDM registers */
                        /* backup EDM registers */
                        aice_backup_edm_registers(coreid);
@@ -2742,7 +2701,7 @@ static int aice_usb_state(uint32_t coreid, enum aice_target_state_s *state)
                        aice_init_edm_registers(coreid, true);
                        aice_backup_tmp_registers(coreid);
                        core_info[coreid].core_state = AICE_TARGET_HALTED;
-               } else if (AICE_TARGET_UNKNOWN == core_info[coreid].core_state) {
+               } else if (core_info[coreid].core_state == AICE_TARGET_UNKNOWN) {
                        /* debug 'debug mode', use force debug to halt core */
                        aice_usb_halt(coreid);
                }
@@ -2761,7 +2720,7 @@ static int aice_usb_reset(void)
                return ERROR_FAIL;
 
        /* issue TRST */
-       if (custom_trst_script == NULL) {
+       if (!custom_trst_script) {
                if (aice_write_ctrl(AICE_WRITE_CTRL_JTAG_PIN_CONTROL,
                                        AICE_JTAG_PIN_CONTROL_TRST) != ERROR_OK)
                        return ERROR_FAIL;
@@ -2784,7 +2743,7 @@ static int aice_issue_srst(uint32_t coreid)
        /* After issuing srst, target will be running. So we need to restore EDM_CTL. */
        aice_restore_edm_registers(coreid);
 
-       if (custom_srst_script == NULL) {
+       if (!custom_srst_script) {
                if (aice_write_ctrl(AICE_WRITE_CTRL_JTAG_PIN_CONTROL,
                                        AICE_JTAG_PIN_CONTROL_SRST) != ERROR_OK)
                        return ERROR_FAIL;
@@ -2828,7 +2787,7 @@ static int aice_issue_reset_hold(uint32_t coreid)
                aice_write_ctrl(AICE_WRITE_CTRL_JTAG_PIN_STATUS, pin_status & (~0x4));
 
        /* issue restart */
-       if (custom_restart_script == NULL) {
+       if (!custom_restart_script) {
                if (aice_write_ctrl(AICE_WRITE_CTRL_JTAG_PIN_CONTROL,
                                        AICE_JTAG_PIN_CONTROL_RESTART) != ERROR_OK)
                        return ERROR_FAIL;
@@ -2848,7 +2807,7 @@ static int aice_issue_reset_hold(uint32_t coreid)
                aice_write_ctrl(AICE_WRITE_CTRL_JTAG_PIN_STATUS, pin_status | 0x4);
 
                /* issue restart again */
-               if (custom_restart_script == NULL) {
+               if (!custom_restart_script) {
                        if (aice_write_ctrl(AICE_WRITE_CTRL_JTAG_PIN_CONTROL,
                                                AICE_JTAG_PIN_CONTROL_RESTART) != ERROR_OK)
                                return ERROR_FAIL;
@@ -2906,7 +2865,7 @@ static int aice_issue_reset_hold_multi(void)
 
 static int aice_usb_assert_srst(uint32_t coreid, enum aice_srst_type_s srst)
 {
-       if ((AICE_SRST != srst) && (AICE_RESET_HOLD != srst))
+       if ((srst != AICE_SRST) && (srst != AICE_RESET_HOLD))
                return ERROR_FAIL;
 
        /* clear DBGER */
@@ -2915,10 +2874,10 @@ static int aice_usb_assert_srst(uint32_t coreid, enum aice_srst_type_s srst)
                return ERROR_FAIL;
 
        int result = ERROR_OK;
-       if (AICE_SRST == srst)
+       if (srst == AICE_SRST)
                result = aice_issue_srst(coreid);
        else {
-               if (1 == total_num_of_core)
+               if (total_num_of_core == 1)
                        result = aice_issue_reset_hold(coreid);
                else
                        result = aice_issue_reset_hold_multi();
@@ -3001,7 +2960,7 @@ static int aice_usb_step(uint32_t coreid)
                aice_write_reg(coreid, ir0_reg_num, ir0_value);
        }
 
-       if (ERROR_FAIL == aice_usb_run(coreid))
+       if (aice_usb_run(coreid) == ERROR_FAIL)
                return ERROR_FAIL;
 
        int i = 0;
@@ -3011,7 +2970,7 @@ static int aice_usb_step(uint32_t coreid)
                if (aice_usb_state(coreid, &state) != ERROR_OK)
                        return ERROR_FAIL;
 
-               if (AICE_TARGET_HALTED == state)
+               if (state == AICE_TARGET_HALTED)
                        break;
 
                int64_t then = 0;
@@ -3121,7 +3080,7 @@ static int aice_usb_read_memory_unit(uint32_t coreid, uint32_t addr, uint32_t si
                        ", size: %" PRIu32 ", count: %" PRIu32 "",
                        addr, size, count);
 
-       if (NDS_MEMORY_ACC_CPU == core_info[coreid].access_channel)
+       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_CPU)
                aice_usb_set_address_dim(coreid, addr);
 
        uint32_t value;
@@ -3130,7 +3089,7 @@ static int aice_usb_read_memory_unit(uint32_t coreid, uint32_t addr, uint32_t si
 
        switch (size) {
                case 1:
-                       if (NDS_MEMORY_ACC_BUS == core_info[coreid].access_channel)
+                       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_BUS)
                                read_mem_func = aice_usb_read_mem_b_bus;
                        else
                                read_mem_func = aice_usb_read_mem_b_dim;
@@ -3142,7 +3101,7 @@ static int aice_usb_read_memory_unit(uint32_t coreid, uint32_t addr, uint32_t si
                        }
                        break;
                case 2:
-                       if (NDS_MEMORY_ACC_BUS == core_info[coreid].access_channel)
+                       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_BUS)
                                read_mem_func = aice_usb_read_mem_h_bus;
                        else
                                read_mem_func = aice_usb_read_mem_h_dim;
@@ -3156,7 +3115,7 @@ static int aice_usb_read_memory_unit(uint32_t coreid, uint32_t addr, uint32_t si
                        }
                        break;
                case 4:
-                       if (NDS_MEMORY_ACC_BUS == core_info[coreid].access_channel)
+                       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_BUS)
                                read_mem_func = aice_usb_read_mem_w_bus;
                        else
                                read_mem_func = aice_usb_read_mem_w_dim;
@@ -3240,7 +3199,7 @@ static int aice_usb_write_memory_unit(uint32_t coreid, uint32_t addr, uint32_t s
                        ", size: %" PRIu32 ", count: %" PRIu32 "",
                        addr, size, count);
 
-       if (NDS_MEMORY_ACC_CPU == core_info[coreid].access_channel)
+       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_CPU)
                aice_usb_set_address_dim(coreid, addr);
 
        size_t i;
@@ -3248,7 +3207,7 @@ static int aice_usb_write_memory_unit(uint32_t coreid, uint32_t addr, uint32_t s
 
        switch (size) {
                case 1:
-                       if (NDS_MEMORY_ACC_BUS == core_info[coreid].access_channel)
+                       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_BUS)
                                write_mem_func = aice_usb_write_mem_b_bus;
                        else
                                write_mem_func = aice_usb_write_mem_b_dim;
@@ -3260,7 +3219,7 @@ static int aice_usb_write_memory_unit(uint32_t coreid, uint32_t addr, uint32_t s
                        }
                        break;
                case 2:
-                       if (NDS_MEMORY_ACC_BUS == core_info[coreid].access_channel)
+                       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_BUS)
                                write_mem_func = aice_usb_write_mem_h_bus;
                        else
                                write_mem_func = aice_usb_write_mem_h_dim;
@@ -3275,7 +3234,7 @@ static int aice_usb_write_memory_unit(uint32_t coreid, uint32_t addr, uint32_t s
                        }
                        break;
                case 4:
-                       if (NDS_MEMORY_ACC_BUS == core_info[coreid].access_channel)
+                       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_BUS)
                                write_mem_func = aice_usb_write_mem_w_bus;
                        else
                                write_mem_func = aice_usb_write_mem_w_dim;
@@ -3351,10 +3310,10 @@ static int aice_usb_bulk_read_mem(uint32_t coreid, uint32_t addr,
 
        int retval;
 
-       if (NDS_MEMORY_ACC_CPU == core_info[coreid].access_channel)
+       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_CPU)
                aice_usb_set_address_dim(coreid, addr);
 
-       if (NDS_MEMORY_ACC_CPU == core_info[coreid].access_channel)
+       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_CPU)
                retval = aice_usb_read_memory_unit(coreid, addr, 4, length / 4, buffer);
        else
                retval = aice_bulk_read_mem(coreid, addr, length / 4, buffer);
@@ -3369,10 +3328,10 @@ static int aice_usb_bulk_write_mem(uint32_t coreid, uint32_t addr,
 
        int retval;
 
-       if (NDS_MEMORY_ACC_CPU == core_info[coreid].access_channel)
+       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_CPU)
                aice_usb_set_address_dim(coreid, addr);
 
-       if (NDS_MEMORY_ACC_CPU == core_info[coreid].access_channel)
+       if (core_info[coreid].access_channel == NDS_MEMORY_ACC_CPU)
                retval = aice_usb_write_memory_unit(coreid, addr, 4, length / 4, buffer);
        else
                retval = aice_bulk_write_mem(coreid, addr, length / 4, buffer);
@@ -3382,10 +3341,10 @@ static int aice_usb_bulk_write_mem(uint32_t coreid, uint32_t addr,
 
 static int aice_usb_read_debug_reg(uint32_t coreid, uint32_t addr, uint32_t *val)
 {
-       if (AICE_TARGET_HALTED == core_info[coreid].core_state) {
-               if (NDS_EDM_SR_EDMSW == addr) {
+       if (core_info[coreid].core_state == AICE_TARGET_HALTED) {
+               if (addr == NDS_EDM_SR_EDMSW) {
                        *val = core_info[coreid].edmsw_backup;
-               } else if (NDS_EDM_SR_EDM_DTR == addr) {
+               } else if (addr == NDS_EDM_SR_EDM_DTR) {
                        if (core_info[coreid].target_dtr_valid) {
                                /* if EDM_DTR has read out, clear it. */
                                *val = core_info[coreid].target_dtr_backup;
@@ -3402,8 +3361,8 @@ static int aice_usb_read_debug_reg(uint32_t coreid, uint32_t addr, uint32_t *val
 
 static int aice_usb_write_debug_reg(uint32_t coreid, uint32_t addr, const uint32_t val)
 {
-       if (AICE_TARGET_HALTED == core_info[coreid].core_state) {
-               if (NDS_EDM_SR_EDM_DTR == addr) {
+       if (core_info[coreid].core_state == AICE_TARGET_HALTED) {
+               if (addr == NDS_EDM_SR_EDM_DTR) {
                        core_info[coreid].host_dtr_backup = val;
                        core_info[coreid].edmsw_backup |= 0x2;
                        core_info[coreid].host_dtr_valid = true;
@@ -3431,7 +3390,7 @@ static int aice_usb_memory_mode(uint32_t coreid, enum nds_memory_select mem_sele
 
        core_info[coreid].memory_select = mem_select;
 
-       if (NDS_MEMORY_SELECT_AUTO != core_info[coreid].memory_select)
+       if (core_info[coreid].memory_select != NDS_MEMORY_SELECT_AUTO)
                aice_write_misc(coreid, NDS_EDM_MISC_ACC_CTL,
                                core_info[coreid].memory_select - 1);
        else
@@ -3483,13 +3442,13 @@ static int aice_usb_read_tlb(uint32_t coreid, target_addr_t virtual_address,
        aice_read_reg(coreid, MR4, &value_mr4);
 
        access_page_size = value_mr4 & 0xF;
-       if (0 == access_page_size) { /* 4K page */
+       if (access_page_size == 0) { /* 4K page */
                virtual_offset = virtual_address & 0x00000FFF;
                physical_page_number = value_mr3 & 0xFFFFF000;
-       } else if (1 == access_page_size) { /* 8K page */
+       } else if (access_page_size == 1) { /* 8K page */
                virtual_offset = virtual_address & 0x00001FFF;
                physical_page_number = value_mr3 & 0xFFFFE000;
-       } else if (5 == access_page_size) { /* 1M page */
+       } else if (access_page_size == 5) { /* 1M page */
                virtual_offset = virtual_address & 0x000FFFFF;
                physical_page_number = value_mr3 & 0xFFF00000;
        } else {
@@ -3575,10 +3534,10 @@ static int aice_usb_dcache_inval_all(uint32_t coreid)
                        cache_index = (way_index << (dcache->log2_set + dcache->log2_line_size)) |
                                (set_index << dcache->log2_line_size);
 
-                       if (ERROR_OK != aice_write_dtr(coreid, cache_index))
+                       if (aice_write_dtr(coreid, cache_index) != ERROR_OK)
                                return ERROR_FAIL;
 
-                       if (ERROR_OK != aice_execute_dim(coreid, instructions, 4))
+                       if (aice_execute_dim(coreid, instructions, 4) != ERROR_OK)
                                return ERROR_FAIL;
                }
        }
@@ -3623,10 +3582,10 @@ static int aice_usb_dcache_wb_all(uint32_t coreid)
                        cache_index = (way_index << (dcache->log2_set + dcache->log2_line_size)) |
                                (set_index << dcache->log2_line_size);
 
-                       if (ERROR_OK != aice_write_dtr(coreid, cache_index))
+                       if (aice_write_dtr(coreid, cache_index) != ERROR_OK)
                                return ERROR_FAIL;
 
-                       if (ERROR_OK != aice_execute_dim(coreid, instructions, 4))
+                       if (aice_execute_dim(coreid, instructions, 4) != ERROR_OK)
                                return ERROR_FAIL;
                }
        }
@@ -3671,10 +3630,10 @@ static int aice_usb_icache_inval_all(uint32_t coreid)
                        cache_index = (way_index << (icache->log2_set + icache->log2_line_size)) |
                                (set_index << icache->log2_line_size);
 
-                       if (ERROR_OK != aice_write_dtr(coreid, cache_index))
+                       if (aice_write_dtr(coreid, cache_index) != ERROR_OK)
                                return ERROR_FAIL;
 
-                       if (ERROR_OK != aice_execute_dim(coreid, instructions, 4))
+                       if (aice_execute_dim(coreid, instructions, 4) != ERROR_OK)
                                return ERROR_FAIL;
                }
        }
@@ -3750,7 +3709,7 @@ static int aice_usb_program_edm(uint32_t coreid, char *command_sequence)
 
        /* init strtok() */
        command_str = strtok(command_sequence, ";");
-       if (command_str == NULL)
+       if (!command_str)
                return ERROR_OK;
 
        do {
@@ -3769,14 +3728,14 @@ static int aice_usb_program_edm(uint32_t coreid, char *command_sequence)
                        reg_name_0 = strstr(command_str, "gen_port0");
                        reg_name_1 = strstr(command_str, "gen_port1");
 
-                       if (reg_name_0 != NULL) {
+                       if (reg_name_0) {
                                data_value = strtoul(reg_name_0 + 9, NULL, 0);
 
                                if (aice_write_misc(coreid,
                                                        NDS_EDM_MISC_GEN_PORT0, data_value) != ERROR_OK)
                                        return ERROR_FAIL;
 
-                       } else if (reg_name_1 != NULL) {
+                       } else if (reg_name_1) {
                                data_value = strtoul(reg_name_1 + 9, NULL, 0);
 
                                if (aice_write_misc(coreid,
@@ -3792,7 +3751,7 @@ static int aice_usb_program_edm(uint32_t coreid, char *command_sequence)
                /* update command_str */
                command_str = strtok(NULL, ";");
 
-       } while (command_str != NULL);
+       } while (command_str);
 
        return ERROR_OK;
 }
@@ -3804,7 +3763,7 @@ static int aice_usb_set_command_mode(enum aice_command_mode command_mode)
        /* flush usb_packets_buffer as users change mode */
        retval = aice_usb_packet_flush();
 
-       if (AICE_COMMAND_MODE_BATCH == command_mode) {
+       if (command_mode == AICE_COMMAND_MODE_BATCH) {
                /* reset batch buffer */
                aice_command_mode = AICE_COMMAND_MODE_NORMAL;
                retval = aice_write_ctrl(AICE_WRITE_CTRL_BATCH_CMD_BUF0_CTRL, 0x40000);
@@ -3925,13 +3884,13 @@ static int fill_profiling_batch_commands(uint32_t coreid, uint32_t reg_no)
        aice_read_dtr_to_buffer(coreid, AICE_BATCH_DATA_BUFFER_0);
 
        /* get samples */
-       if (NDS32_REG_TYPE_GPR == nds32_reg_type(reg_no)) {
+       if (nds32_reg_type(reg_no) == NDS32_REG_TYPE_GPR) {
                /* general registers */
                dim_instructions[0] = MTSR_DTR(reg_no);
                dim_instructions[1] = DSB;
                dim_instructions[2] = NOP;
                dim_instructions[3] = BEQ_MINUS_12;
-       } else if (NDS32_REG_TYPE_SPR == nds32_reg_type(reg_no)) {
+       } else if (nds32_reg_type(reg_no) == NDS32_REG_TYPE_SPR) {
                /* user special registers */
                dim_instructions[0] = MFUSR_G0(0, nds32_reg_sr_index(reg_no));
                dim_instructions[1] = MTSR_DTR(0);
@@ -4029,7 +3988,7 @@ static int aice_usb_profiling(uint32_t coreid, uint32_t interval, uint32_t itera
 
                /* check status */
                uint32_t i;
-               uint32_t batch_status;
+               uint32_t batch_status = 0;
 
                i = 0;
                while (1) {