X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fjlink.c;h=f984639b27e5d0f040fd37ac3e8efebd455a47d9;hp=6665c7e32005924abe59108739add4294d73a9e1;hb=004c7124c44819960da97de85f422f630f04d7ba;hpb=a8f1307992277a0ef53819583dad7ad444e29043

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 6665c7e320..f984639b27 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -25,14 +25,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
 #include <usb.h>
-#include <string.h>
 
-#include "log.h"
 
 #define VID 0x1366
 #define PID 0x0101
@@ -56,8 +52,11 @@ static u8 usb_emu_result_buffer[JLINK_EMU_RESULT_BUFFER_SIZE];
 #define EMU_CMD_VERSION     		0x01
 #define EMU_CMD_SET_SPEED   		0x05
 #define EMU_CMD_GET_STATE   		0x07
+#define EMU_CMD_HW_CLOCK			0xc8
+#define EMU_CMD_HW_TMS0 			0xc9
+#define EMU_CMD_HW_TMS1 			0xca
 #define EMU_CMD_HW_JTAG3    		0xcf
-#define EMU_CMD_GET_MAX_MEM_BLOCK   0xd4
+#define EMU_CMD_GET_MAX_MEM_BLOCK	0xd4
 #define EMU_CMD_HW_RESET0   		0xdc
 #define EMU_CMD_HW_RESET1   		0xdd
 #define EMU_CMD_HW_TRST0    		0xde
@@ -182,7 +181,7 @@ static void jlink_execute_scan(jtag_command_t *cmd)
 	enum scan_type type;
 	u8 *buffer;
 
-	DEBUG_JTAG_IO("scan end in %i", cmd->cmd.scan->end_state);
+	DEBUG_JTAG_IO("scan end in %s", tap_state_name(cmd->cmd.scan->end_state));
 
 	if (cmd->cmd.scan->end_state != TAP_INVALID)
 		jlink_end_state(cmd->cmd.scan->end_state);
@@ -205,10 +204,13 @@ static void jlink_execute_reset(jtag_command_t *cmd)
 
 	jlink_tap_execute();
 
-	if (cmd->cmd.reset->trst == 1)
+	if ( (cmd->cmd.reset->trst == 1) || ( cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST) ) )
+	{
 		tap_set_state(TAP_RESET);
+	}
 
 	jlink_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+	jlink_tap_execute();
 }
 
 static void jlink_execute_sleep(jtag_command_t *cmd)
@@ -332,6 +334,7 @@ static int jlink_init(void)
 	LOG_INFO("J-Link JTAG Interface ready");
 
 	jlink_reset(0, 0);
+	jtag_sleep(3000);
 	jlink_tap_init();
 	jlink_speed(jtag_speed);
 
@@ -366,8 +369,9 @@ static void jlink_state_move(void)
 	int i;
 	int tms = 0;
 	u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
+	u8 tms_scan_bits = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
-	for (i = 0; i < 7; i++)
+	for (i = 0; i < tms_scan_bits; i++)
 	{
 		tms = (tms_scan >> i) & 1;
 		jlink_tap_append_step(tms, 0);
@@ -413,6 +417,7 @@ static void jlink_runtest(int num_cycles)
 	{
 		jlink_end_state(TAP_IDLE);
 		jlink_state_move();
+//		num_cycles--;
 	}
 
 	/* execute num_cycles */
@@ -468,24 +473,23 @@ static void jlink_reset(int trst, int srst)
 	if (srst == 0)
 	{
 		jlink_simple_command(EMU_CMD_HW_RESET1);
-		jlink_end_state(TAP_RESET);
-		jlink_state_move();
 	}
-	else if (srst == 1)
+	if (srst == 1)
 	{
 		jlink_simple_command(EMU_CMD_HW_RESET0);
 	}
 
+	if (trst == 1)
+	{
+		jlink_simple_command(EMU_CMD_HW_TRST0);
+	}
 	if (trst == 0)
 	{
 		jlink_simple_command(EMU_CMD_HW_TRST1);
+		jtag_sleep(5000);
 		jlink_end_state(TAP_RESET);
 		jlink_state_move();
 	}
-	else if (trst == 1)
-	{
-		jlink_simple_command(EMU_CMD_HW_TRST0);
-	}
 }
 
 static void jlink_simple_command(u8 command)
@@ -601,9 +605,9 @@ static int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx, ch
 /* J-Link tap functions */
 
 /* 2048 is the max value we can use here */
-#define JLINK_TAP_BUFFER_SIZE 2048
+#define JLINK_TAP_BUFFER_SIZE 1024
 
-static unsigned tap_length;
+static unsigned tap_length=0;
 static u8 tms_buffer[JLINK_TAP_BUFFER_SIZE];
 static u8 tdi_buffer[JLINK_TAP_BUFFER_SIZE];
 static u8 tdo_buffer[JLINK_TAP_BUFFER_SIZE];
@@ -621,8 +625,6 @@ typedef struct
 static int pending_scan_results_length;
 static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
 
-static int last_tms;
-
 static void jlink_tap_init(void)
 {
 	tap_length = 0;
@@ -632,7 +634,7 @@ static void jlink_tap_init(void)
 static void jlink_tap_ensure_space(int scans, int bits)
 {
 	int available_scans = MAX_PENDING_SCAN_RESULTS - pending_scan_results_length;
-	int available_bits = JLINK_TAP_BUFFER_SIZE * 8 - tap_length;
+	int available_bits = JLINK_TAP_BUFFER_SIZE * 8 - tap_length - 64;
 
 	if (scans > available_scans || bits > available_bits)
 	{
@@ -642,7 +644,6 @@ static void jlink_tap_ensure_space(int scans, int bits)
 
 static void jlink_tap_append_step(int tms, int tdi)
 {
-	last_tms = tms;
 	int index = tap_length / 8;
 
 	if (index >= JLINK_TAP_BUFFER_SIZE)
@@ -656,7 +657,9 @@ static void jlink_tap_append_step(int tms, int tdi)
 
 	// we do not pad TMS, so be sure to initialize all bits
 	if (0 == bit_index)
+	{
 		tms_buffer[index] = tdi_buffer[index] = 0;
+	}
 
 	if (tms)
 		tms_buffer[index] |= bit;
@@ -684,8 +687,8 @@ static void jlink_tap_append_scan(int length, u8 *buffer, scan_command_t *comman
 
 	for (i = 0; i < length; i++)
 	{
-		int tms = i < length - 1 ? 0 : 1;
-		int tdi = buffer[i / 8] & (1 << (i % 8));
+		int tms = (i < (length - 1)) ? 0 : 1;
+		int tdi = (buffer[i / 8] & (1 << (i % 8)))!=0;
 		jlink_tap_append_step(tms, tdi);
 	}
 	pending_scan_results_length++;
@@ -702,6 +705,13 @@ static int jlink_tap_execute(void)
 	if (!tap_length)
 		return ERROR_OK;
 
+	/* JLink returns an extra NULL in packet when size of in message is a multiple of 64, creates problems with usb comms */
+	/* WARNING This will interfere with tap state counting */
+	while ((TAP_SCAN_BYTES(tap_length)%64)==0)
+	{
+		jlink_tap_append_step((tap_get_state() == TAP_RESET)?1:0, 0);
+	}
+
 	// number of full bytes (plus one if some would be left over)
 	byte_length = TAP_SCAN_BYTES(tap_length);
 
@@ -841,9 +851,15 @@ static int jlink_usb_message(jlink_jtag_t *jlink_jtag, int out_length, int in_le
 		result2 = jlink_usb_read_emu_result(jlink_jtag);
 		if (1 != result2)
 		{
-			LOG_ERROR("jlink_usb_read_emu_result failed "
-				"(requested=1, result=%d)", result2);
-			return ERROR_JTAG_DEVICE_ERROR;
+			LOG_ERROR("jlink_usb_read_emu_result retried requested=1, result=%d, in_length=%i", result2,in_length);
+			/* Try again once, should only happen if (in_length%64==0) */
+			result2 = jlink_usb_read_emu_result(jlink_jtag);
+			if (1 != result2)
+			{
+				LOG_ERROR("jlink_usb_read_emu_result failed "
+					"(requested=1, result=%d)", result2);
+				return ERROR_JTAG_DEVICE_ERROR;
+			}
 		}
 
 		/* Check the result itself */
@@ -870,21 +886,17 @@ static int usb_bulk_with_retries(
 		usb_dev_handle *dev, int ep,
 		char *bytes, int size, int timeout)
 {
-	int rc = 0, tries = 3, this_size;
-
-	while (tries && size) {
+	int tries = 3, count = 0;
 
-		this_size = f(dev, ep, bytes, size, timeout);
-		if (this_size > 0) {
-			
-			size -= this_size;
-			rc += this_size;
-			bytes += this_size;
-
-		} else
-			tries --;
+	while (tries && (count < size))
+	{
+		int result = f(dev, ep, bytes + count, size - count, timeout);
+		if (result > 0)
+			count += result;
+		else if ((-ETIMEDOUT != result) || !--tries)
+			return result;
 	}
-	return rc;
+	return count;
 }
 
 static int wrap_usb_bulk_write(usb_dev_handle *dev, int ep,
@@ -981,3 +993,4 @@ static void jlink_debug_buffer(u8 *buffer, int length)
 	}
 }
 #endif
+