stlink: fix SWIM mode on stlink-v3

[openocd.git] / src / jtag / drivers / stlink_usb.c

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 811ad5325275a7802e46c96233b7095d101c6c35..2bbd03b6a4db657a29df90a9faec6176316262d8 100644 (file)
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -568,7 +568,7 @@ static int jtag_libusb_bulk_transfer_n(
                transfers[i].transfer_size = 0;
                transfers[i].transfer = libusb_alloc_transfer(0);
 
-               if (transfers[i].transfer == NULL) {
+               if (!transfers[i].transfer) {
                        for (size_t j = 0; j < i; ++j)
                                libusb_free_transfer(transfers[j].transfer);
 
@@ -1626,7 +1626,8 @@ static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int init
                }
        }
 
-       if (h->version.jtag_api == STLINK_JTAG_API_V3) {
+       if (h->version.jtag_api == STLINK_JTAG_API_V3 &&
+                       (emode == STLINK_MODE_DEBUG_JTAG || emode == STLINK_MODE_DEBUG_SWD)) {
                struct speed_map map[STLINK_V3_MAX_FREQ_NB];
 
                stlink_get_com_freq(h, (emode == STLINK_MODE_DEBUG_JTAG), map);
@@ -3084,7 +3085,7 @@ static int stlink_usb_usb_open(void *handle, struct hl_interface_param_s *param)
        h->cmdbuf = malloc(STLINK_SG_SIZE);
        h->databuf = malloc(STLINK_DATA_SIZE);
 
-       if (h->cmdbuf == NULL || h->databuf == NULL)
+       if (!h->cmdbuf || !h->databuf)
                return ERROR_FAIL;
 
        /*
@@ -3198,7 +3199,7 @@ static int stlink_tcp_open(void *handle, struct hl_interface_param_s *param)
        h->tcp_backend_priv.send_buf = malloc(STLINK_TCP_SEND_BUFFER_SIZE);
        h->tcp_backend_priv.recv_buf = malloc(STLINK_TCP_RECV_BUFFER_SIZE);
 
-       if (h->tcp_backend_priv.send_buf == NULL || h->tcp_backend_priv.recv_buf == NULL)
+       if (!h->tcp_backend_priv.send_buf || !h->tcp_backend_priv.recv_buf)
                return ERROR_FAIL;
 
        h->cmdbuf = &h->tcp_backend_priv.send_buf[8];