X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fstlink_usb.c;h=331d30b7ba708de2a28083c963bbfcf7c7e902d3;hp=b54fc4d7377ed2cf3ca8a8281eaae9c7ad555c1f;hb=a09a75653dbe7ad99da6349285ab6622b80fdc15;hpb=d940a3224b3c06e6008c03d8dcb2682ea4135b7a

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index b54fc4d737..331d30b7ba 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -1031,16 +1031,16 @@ static int stlink_configure_target_trace_port(void *handle)
 	if (res != ERROR_OK)
 		goto out;
 	/* set the TPI clock prescaler */
-	res = stlink_usb_write_debug_reg(handle, TPI_ACPR, h->trace.prescale);
+	res = stlink_usb_write_debug_reg(handle, TPIU_ACPR, h->trace.prescale);
 	if (res != ERROR_OK)
 		goto out;
 	/* select the pin protocol.  The STLinkv2 only supports asynchronous
 	 * UART emulation (NRZ) mode, so that's what we pick. */
-	res = stlink_usb_write_debug_reg(handle, TPI_SPPR, 0x02);
+	res = stlink_usb_write_debug_reg(handle, TPIU_SPPR, 0x02);
 	if (res != ERROR_OK)
 		goto out;
 	/* disable continuous formatting */
-	res = stlink_usb_write_debug_reg(handle, TPI_FFCR, (1<<8));
+	res = stlink_usb_write_debug_reg(handle, TPIU_FFCR, (1<<8));
 	if (res != ERROR_OK)
 		goto out;
 
@@ -1059,7 +1059,7 @@ static int stlink_configure_target_trace_port(void *handle)
 	if (res != ERROR_OK)
 		goto out;
 	/* trace port enable (port 0) */
-	res = stlink_usb_write_debug_reg(handle, ITM_TER, (1<<0));
+	res = stlink_usb_write_debug_reg(handle, ITM_TER0, (1<<0));
 	if (res != ERROR_OK)
 		goto out;
 
@@ -1664,14 +1664,14 @@ static int stlink_speed(void *handle, int khz, bool query)
 }
 
 /** */
-static int stlink_usb_close(void *fd)
+static int stlink_usb_close(void *handle)
 {
-	struct stlink_usb_handle_s *h = fd;
+	struct stlink_usb_handle_s *h = handle;
 
-	if (h->fd)
+	if (h && h->fd)
 		jtag_libusb_close(h->fd);
 
-	free(fd);
+	free(h);
 
 	return ERROR_OK;
 }
@@ -1831,7 +1831,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 	err = stlink_usb_init_mode(h, param->connect_under_reset);
 
 	if (err != ERROR_OK) {
-		LOG_ERROR("init mode failed");
+		LOG_ERROR("init mode failed (unable to connect to the target)");
 		goto error_open;
 	}