X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fjlink.c;h=e7e3ced9797cb60d7cace00c60261d2c19a97827;hp=21dfab2277ec24be3a543774e31236acd111c109;hb=740b9e25b410c164e661d0334a9ea4168406726b;hpb=6030a5cb2af17fc4bb47788265c9b1400318da6b

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 21dfab2277..e7e3ced979 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -32,6 +32,9 @@
 /* See Segger's public documentation:
  *	Reference manual for J-Link USB Protocol
  *	Document RM08001-R6 Date: June 16, 2009
+ *      (Or newer, with some SWD information).
+ 
+http://www.segger.com/cms/admin/uploads/productDocs/RM08001_JLinkUSBProtocol.pdf
  */
 
 #define VID 0x1366
@@ -202,7 +205,7 @@ static void jlink_execute_command(struct jtag_command *cmd)
 	switch (cmd->type)
 	{
 	case JTAG_RUNTEST:   jlink_execute_runtest(cmd); break;
-	case JTAG_STATEMOVE: jlink_execute_statemove(cmd); break;
+	case JTAG_TLR_RESET: jlink_execute_statemove(cmd); break;
 	case JTAG_PATHMOVE:  jlink_execute_pathmove(cmd); break;
 	case JTAG_SCAN:      jlink_execute_scan(cmd); break;
 	case JTAG_RESET:     jlink_execute_reset(cmd); break;
@@ -318,7 +321,11 @@ static int jlink_init(void)
 	jlink_reset(0, 0);
 	jtag_sleep(3000);
 	jlink_tap_init();
-	jlink_speed(jtag_get_speed());
+	int jtag_speed_var;
+	int retval = jtag_get_speed(&jtag_speed_var);
+	if (retval != ERROR_OK)
+		return retval;
+	jlink_speed(jtag_speed_var);
 
 	/* v5/6 jlink seems to have an issue if the first tap move
 	 * is not divisible by 8, so we send a TLR on first power up */
@@ -712,9 +719,9 @@ static void jlink_tap_ensure_space(int scans, int bits)
 
 static void jlink_tap_append_step(int tms, int tdi)
 {
-	int index = tap_length / 8;
+	int index_var = tap_length / 8;
 
-	if (index >= JLINK_TAP_BUFFER_SIZE)
+	if (index_var >= JLINK_TAP_BUFFER_SIZE)
 	{
 		LOG_ERROR("jlink_tap_append_step: overflow");
 		*(uint32_t *)0xFFFFFFFF = 0;
@@ -727,18 +734,18 @@ 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;
+		tms_buffer[index_var] = tdi_buffer[index_var] = 0;
 	}
 
 	if (tms)
-		tms_buffer[index] |= bit;
+		tms_buffer[index_var] |= bit;
 	else
-		tms_buffer[index] &= ~bit;
+		tms_buffer[index_var] &= ~bit;
 
 	if (tdi)
-		tdi_buffer[index] |= bit;
+		tdi_buffer[index_var] |= bit;
 	else
-		tdi_buffer[index] &= ~bit;
+		tdi_buffer[index_var] &= ~bit;
 
 	tap_length++;
 }