X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fzy1000%2Fzy1000.c;h=1edf57f8ea2eda4171b1e9caade039c65708e7a9;hp=4dbdef249192d86013d3e6ed204d2adedefff788;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=6dc2c2ce970863a079f101d84a0c47b37b682c76

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 4dbdef2491..1edf57f8ea 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2008 by Øyvind Harboe                              *
+ *   Copyright (C) 2007-2008 by Øyvind Harboe                              *
  *                                                                         *
  *   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  *
@@ -23,55 +23,52 @@
 #include "embeddedice.h"
 #include "minidriver.h"
 #include "interface.h"
+#include "zy1000_version.h"
 
 #include <cyg/hal/hal_io.h>             // low level i/o
 #include <cyg/hal/hal_diag.h>
 
-
-#define ZYLIN_VERSION "1.52"
+#define ZYLIN_VERSION GIT_ZY1000_VERSION
 #define ZYLIN_DATE __DATE__
 #define ZYLIN_TIME __TIME__
-#define ZYLIN_OPENOCD "$Revision$"
-#define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME
-const char *zylin_config_dir="/config/settings";
+#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION
+#define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE
 
 /* low level command set
  */
-int zy1000_read(void);
-static void zy1000_write(int tck, int tms, int tdi);
 void zy1000_reset(int trst, int srst);
 
 
 int zy1000_speed(int speed);
-int zy1000_register_commands(struct command_context_s *cmd_ctx);
+int zy1000_register_commands(struct command_context *cmd_ctx);
 int zy1000_init(void);
 int zy1000_quit(void);
 
 /* interface commands */
-int zy1000_handle_zy1000_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+int zy1000_handle_zy1000_port_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc);
 
 static int zy1000_khz(int khz, int *jtag_speed)
 {
-	if (khz==0)
+	if (khz == 0)
 	{
-		*jtag_speed=0;
+		*jtag_speed = 0;
 	}
 	else
 	{
-		*jtag_speed=64000/khz;
+		*jtag_speed = 64000/khz;
 	}
 	return ERROR_OK;
 }
 
 static int zy1000_speed_div(int speed, int *khz)
 {
-	if (speed==0)
+	if (speed == 0)
 	{
 		*khz = 0;
 	}
 	else
 	{
-		*khz=64000/speed;
+		*khz = 64000/speed;
 	}
 
 	return ERROR_OK;
@@ -81,8 +78,8 @@ static bool readPowerDropout(void)
 {
 	cyg_uint32 state;
 	// sample and clear power dropout
-	HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x80);
-	HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
+	HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x80);
+	HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state);
 	bool powerDropout;
 	powerDropout = (state & 0x80) != 0;
 	return powerDropout;
@@ -93,8 +90,8 @@ static bool readSRST(void)
 {
 	cyg_uint32 state;
 	// sample and clear SRST sensing
-	HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x00000040);
-	HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
+	HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x00000040);
+	HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state);
 	bool srstAsserted;
 	srstAsserted = (state & 0x40) != 0;
 	return srstAsserted;
@@ -102,18 +99,18 @@ static bool readSRST(void)
 
 static int zy1000_srst_asserted(int *srst_asserted)
 {
-	*srst_asserted=readSRST();
+	*srst_asserted = readSRST();
 	return ERROR_OK;
 }
 
 static int zy1000_power_dropout(int *dropout)
 {
-	*dropout=readPowerDropout();
+	*dropout = readPowerDropout();
 	return ERROR_OK;
 }
 
 
-jtag_interface_t zy1000_interface =
+struct jtag_interface zy1000_interface =
 {
 	.name = "ZY1000",
 	.execute_queue = NULL,
@@ -127,59 +124,47 @@ jtag_interface_t zy1000_interface =
 	.srst_asserted = zy1000_srst_asserted,
 };
 
-static void zy1000_write(int tck, int tms, int tdi)
-{
-
-}
-
-int zy1000_read(void)
-{
-	return -1;
-}
-
-extern bool readSRST(void);
-
 void zy1000_reset(int trst, int srst)
 {
 	LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
-	if(!srst)
+	if (!srst)
 	{
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000001);
 	}
 	else
 	{
-		/* Danger!!! if clk!=0 when in
+		/* Danger!!! if clk != 0 when in
 		 * idle in TAP_IDLE, reset halt on str912 will fail.
 		 */
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001);
 	}
 
-	if(!trst)
+	if (!trst)
 	{
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000002);
 	}
 	else
 	{
 		/* assert reset */
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000002);
 	}
 
-	if (trst||(srst&&(jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
+	if (trst||(srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
 	{
 		waitIdle();
 		/* we're now in the RESET state until trst is deasserted */
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_RESET);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_RESET);
 	} else
 	{
 		/* We'll get RCLK failure when we assert TRST, so clear any false positives here */
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);
 	}
 
 	/* wait for srst to float back up */
 	if (!srst)
 	{
 		int i;
-		for (i=0; i<1000; i++)
+		for (i = 0; i < 1000; i++)
 		{
 			// We don't want to sense our own reset, so we clear here.
 			// There is of course a timing hole where we could loose
@@ -191,10 +176,10 @@ void zy1000_reset(int trst, int srst)
 			alive_sleep(1);
 		}
 
-		if (i==1000)
+		if (i == 1000)
 		{
 			LOG_USER("SRST didn't deassert after %dms", i);
-		} else if (i>1)
+		} else if (i > 1)
 		{
 			LOG_USER("SRST took %dms to deassert", i);
 		}
@@ -203,24 +188,24 @@ void zy1000_reset(int trst, int srst)
 
 int zy1000_speed(int speed)
 {
-	if(speed == 0)
+	if (speed == 0)
 	{
 		/*0 means RCLK*/
 		speed = 0;
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x100);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x100);
 		LOG_DEBUG("jtag_speed using RCLK");
 	}
 	else
 	{
-		if(speed > 8190 || speed < 2)
+		if (speed > 8190 || speed < 2)
 		{
 			LOG_USER("valid ZY1000 jtag_speed=[8190,2]. Divisor is 64MHz / even values between 8190-2, i.e. min 7814Hz, max 32MHz");
 			return ERROR_INVALID_ARGUMENTS;
 		}
 
 		LOG_USER("jtag_speed %d => JTAG clk=%f", speed, 64.0/(float)speed);
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x100);
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x1c, speed&~1);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x100);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed&~1);
 	}
 	return ERROR_OK;
 }
@@ -233,14 +218,14 @@ static void setPower(bool power)
 	savePower = power;
 	if (power)
 	{
-		HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x14, 0x8);
+		HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x14, 0x8);
 	} else
 	{
-		HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x8);
+		HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x8);
 	}
 }
 
-int handle_power_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int handle_power_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc)
 {
 	if (argc > 1)
 	{
@@ -275,28 +260,37 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
 	if ((argc < 1) || (argc > 2))
 		return JIM_ERR;
 	char buff[128];
-	const char *version_str=NULL;
+	const char *version_str = NULL;
 
 	if (argc == 1)
 	{
-		version_str=ZYLIN_OPENOCD_VERSION;
+		version_str = ZYLIN_OPENOCD_VERSION;
 	} else
 	{
 		const char *str = Jim_GetString(argv[1], NULL);
 		if (strcmp("openocd", str) == 0)
 		{
-			int revision;
-			revision = atol(ZYLIN_OPENOCD+strlen("XRevision: "));
-			sprintf(buff, "%d", revision);
-			version_str=buff;
+			version_str = ZYLIN_OPENOCD;
 		}
 		else if (strcmp("zy1000", str) == 0)
 		{
-			version_str=ZYLIN_VERSION;
+			version_str = ZYLIN_VERSION;
 		}
 		else if (strcmp("date", str) == 0)
 		{
-			version_str=ZYLIN_DATE;
+			version_str = ZYLIN_DATE;
+		}
+		else if (strcmp("time", str) == 0)
+		{
+			version_str = ZYLIN_TIME;
+		}
+		else if (strcmp("pcb", str) == 0)
+		{
+#ifdef CYGPKG_HAL_NIOS2
+			version_str="c";
+#else
+			version_str="b";
+#endif
 		}
 		else
 		{
@@ -310,6 +304,37 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
 }
 
 
+#ifdef CYGPKG_HAL_NIOS2
+static int jim_zy1000_writefirmware(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+	if (argc != 2)
+		return JIM_ERR;
+
+	int length;
+	int stat;
+	const char *str = Jim_GetString(argv[1], &length);
+
+	/* BUG!!!! skip header! */
+	void *firmware_address=0x4000000;
+	int firmware_length=0x100000;
+
+	if (length>firmware_length)
+		return JIM_ERR;
+
+	void *err_addr;
+
+    if ((stat = flash_erase((void *)firmware_address, firmware_length, (void **)&err_addr)) != 0)
+    {
+    	return JIM_ERR;
+    }
+
+    if ((stat = flash_program(firmware_address, str, length, (void **)&err_addr)) != 0)
+    	return JIM_ERR;
+
+    return JIM_OK;
+}
+#endif
+
 static int
 zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
 								   int argc,
@@ -322,14 +347,14 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
 	}
 
 	cyg_uint32 status;
-	ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, status);
+	ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, status);
 
-	Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80)!=0));
+	Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0));
 
 	return JIM_OK;
 }
 
-int zy1000_register_commands(struct command_context_s *cmd_ctx)
+int zy1000_register_commands(struct command_context *cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "power", handle_power_command, COMMAND_ANY,
 			"power <on/off> - turn power switch to target on/off. No arguments - print status.");
@@ -339,6 +364,11 @@ int zy1000_register_commands(struct command_context_s *cmd_ctx)
 
 	Jim_CreateCommand(interp, "powerstatus", zylinjtag_Jim_Command_powerstatus, NULL, NULL);
 
+#ifdef CYGPKG_HAL_NIOS2
+	Jim_CreateCommand(interp, "updatezy1000firmware", jim_zy1000_writefirmware, NULL, NULL);
+#endif
+
+
 	return ERROR_OK;
 }
 
@@ -349,7 +379,7 @@ int zy1000_init(void)
 {
 	LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
 
-	ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x30); // Turn on LED1 & LED2
+	ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x30); // Turn on LED1 & LED2
 
 	setPower(true); // on by default
 
@@ -374,11 +404,11 @@ int interface_jtag_execute_queue(void)
 	cyg_uint32 empty;
 
 	waitIdle();
-	ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);
+	ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
 	/* clear JTAG error register */
-	ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
+	ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);
 
-	if ((empty&0x400)!=0)
+	if ((empty&0x400) != 0)
 	{
 		LOG_WARNING("RCLK timeout");
 		/* the error is informative only as we don't want to break the firmware if there
@@ -397,7 +427,7 @@ static cyg_uint32 getShiftValue(void)
 {
 	cyg_uint32 value;
 	waitIdle();
-	ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, value);
+	ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value);
 	VERBOSE(LOG_INFO("getShiftValue %08x", value));
 	return value;
 }
@@ -406,7 +436,7 @@ static cyg_uint32 getShiftValueFlip(void)
 {
 	cyg_uint32 value;
 	waitIdle();
-	ZY1000_PEEK(ZY1000_JTAG_BASE+0x18, value);
+	ZY1000_PEEK(ZY1000_JTAG_BASE + 0x18, value);
 	VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
 	return value;
 }
@@ -417,17 +447,22 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
 {
 	VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value));
 	cyg_uint32 a,b;
-	a=state;
-	b=endState;
-	ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);
-	ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<15)|(repeat<<8)|(a<<4)|b);
+	a = state;
+	b = endState;
+	ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
+	ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 15) | (repeat << 8) | (a << 4) | b);
 	VERBOSE(getShiftValueFlip());
 }
 #endif
 
-extern int jtag_check_value(u8 *captured, void *priv);
+extern int jtag_check_value(uint8_t *captured, void *priv);
 
-static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
+static void gotoEndState(tap_state_t end_state)
+{
+	setCurrentState(end_state);
+}
+
+static __inline void scanFields(int num_fields, const struct scan_field *fields, tap_state_t shiftState, int pause)
 {
 	int i;
 	int j;
@@ -437,104 +472,89 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
 	{
 		cyg_uint32 value;
 
-		static u8 *in_buff=NULL; /* pointer to buffer for scanned data */
-		static int in_buff_size=0;
-		u8 *inBuffer=NULL;
+		uint8_t *inBuffer = NULL;
 
 
 		// figure out where to store the input data
-		int num_bits=fields[i].num_bits;
-		if (fields[i].in_value!=NULL)
+		int num_bits = fields[i].num_bits;
+		if (fields[i].in_value != NULL)
 		{
-			inBuffer=fields[i].in_value;
+			inBuffer = fields[i].in_value;
 		}
 
 		// here we shuffle N bits out/in
-		j=0;
-		while (j<num_bits)
+		j = 0;
+		while (j < num_bits)
 		{
 			tap_state_t pause_state;
 			int l;
-			k=num_bits-j;
-			pause_state=(shiftState==TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT;
-			if (k>32)
+			k = num_bits-j;
+			pause_state = (shiftState == TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT;
+			if (k > 32)
 			{
-				k=32;
+				k = 32;
 				/* we have more to shift out */
-			} else if (i == num_fields-1)
+			} else if (pause&&(i == num_fields-1))
 			{
 				/* this was the last to shift out this time */
-				pause_state=end_state;
+				pause_state = (shiftState==TAP_DRSHIFT)?TAP_DRPAUSE:TAP_IRPAUSE;
 			}
 
-			// we have (num_bits+7)/8 bytes of bits to toggle out.
+			// we have (num_bits + 7)/8 bytes of bits to toggle out.
 			// bits are pushed out LSB to MSB
-			value=0;
-			if (fields[i].out_value!=NULL)
+			value = 0;
+			if (fields[i].out_value != NULL)
 			{
-				for (l=0; l<k; l+=8)
+				for (l = 0; l < k; l += 8)
 				{
-					value|=fields[i].out_value[(j+l)/8]<<l;
+					value|=fields[i].out_value[(j + l)/8]<<l;
 				}
 			}
 			/* mask away unused bits for easier debugging */
-			value&=~(((u32)0xffffffff)<<k);
+			value&=~(((uint32_t)0xffffffff) << k);
 
 			shiftValueInner(shiftState, pause_state, k, value);
 
-			if (inBuffer!=NULL)
+			if (inBuffer != NULL)
 			{
 				// data in, LSB to MSB
-				value=getShiftValue();
+				value = getShiftValue();
 				// we're shifting in data to MSB, shift data to be aligned for returning the value
 				value >>= 32-k;
 
-				for (l=0; l<k; l+=8)
+				for (l = 0; l < k; l += 8)
 				{
-					inBuffer[(j+l)/8]=(value>>l)&0xff;
+					inBuffer[(j + l)/8]=(value >> l)&0xff;
 				}
 			}
-			j+=k;
+			j += k;
 		}
 	}
 }
 
-int interface_jtag_set_end_state(tap_state_t state)
-{
-	return ERROR_OK;
-}
-
-
-int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_ir_scan(int num_fields, const struct scan_field *fields, tap_state_t state)
 {
 
 	int j;
 	int scan_size = 0;
-	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+	struct jtag_tap *tap, *nextTap;
+	for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap = nextTap)
 	{
-		nextTap=jtag_tap_next_enabled(tap);
-		tap_state_t end_state;
-		if (nextTap==NULL)
-		{
-			end_state = state;
-		} else
-		{
-			end_state = TAP_IRSHIFT;
-		}
+		nextTap = jtag_tap_next_enabled(tap);
+		int pause = (nextTap==NULL);
 
 		int found = 0;
 
 		scan_size = tap->ir_length;
 
 		/* search the list */
-		for (j=0; j < num_fields; j++)
+		for (j = 0; j < num_fields; j++)
 		{
 			if (tap == fields[j].tap)
 			{
 				found = 1;
 
-				scanFields(1, fields+j, TAP_IRSHIFT, end_state);
+				scanFields(1, fields + j, TAP_IRSHIFT, pause);
 				/* update device information */
 				buf_cpy(fields[j].out_value, tap->cur_instr, scan_size);
 
@@ -546,18 +566,19 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
 		if (!found)
 		{
 			/* if a device isn't listed, set it to BYPASS */
-			u8 ones[]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
+			uint8_t ones[]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
 
-			scan_field_t tmp;
+			struct scan_field tmp;
 			memset(&tmp, 0, sizeof(tmp));
 			tmp.out_value = ones;
 			tmp.num_bits = scan_size;
-			scanFields(1, &tmp, TAP_IRSHIFT, end_state);
+			scanFields(1, &tmp, TAP_IRSHIFT, pause);
 			/* update device information */
 			buf_cpy(tmp.out_value, tap->cur_instr, scan_size);
 			tap->bypass = 1;
 		}
 	}
+	gotoEndState(state);
 
 	return ERROR_OK;
 }
@@ -566,62 +587,58 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
 
 
 
-int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_ir_scan(int num_fields, const struct scan_field *fields, tap_state_t state)
 {
-	scanFields(num_fields, fields, TAP_IRSHIFT, state);
+	scanFields(num_fields, fields, TAP_IRSHIFT, 1);
+	gotoEndState(state);
 
 	return ERROR_OK;
 }
 
 /*extern jtag_command_t **jtag_get_last_command_p(void);*/
 
-int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_dr_scan(int num_fields, const struct scan_field *fields, tap_state_t state)
 {
 
 	int j;
-	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+	struct jtag_tap *tap, *nextTap;
+	for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap = nextTap)
 	{
-		nextTap=jtag_tap_next_enabled(tap);
-		int found=0;
-		tap_state_t end_state;
-		if (nextTap==NULL)
-		{
-			end_state = state;
-		} else
-		{
-			end_state = TAP_DRSHIFT;
-		}
+		nextTap = jtag_tap_next_enabled(tap);
+		int found = 0;
+		int pause = (nextTap==NULL);
 
-		for (j=0; j < num_fields; j++)
+		for (j = 0; j < num_fields; j++)
 		{
 			if (tap == fields[j].tap)
 			{
 				found = 1;
 
-				scanFields(1, fields+j, TAP_DRSHIFT, end_state);
+				scanFields(1, fields+j, TAP_DRSHIFT, pause);
 			}
 		}
 		if (!found)
 		{
-			scan_field_t tmp;
+			struct scan_field tmp;
 			/* program the scan field to 1 bit length, and ignore it's value */
 			tmp.num_bits = 1;
 			tmp.out_value = NULL;
 			tmp.in_value = NULL;
 
-			scanFields(1, &tmp, TAP_DRSHIFT, end_state);
+			scanFields(1, &tmp, TAP_DRSHIFT, pause);
 		}
 		else
 		{
 		}
 	}
+	gotoEndState(state);
 	return ERROR_OK;
 }
 
-int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_dr_scan(int num_fields, const struct scan_field *fields, tap_state_t state)
 {
-	scanFields(num_fields, fields, TAP_DRSHIFT, state);
+	scanFields(num_fields, fields, TAP_DRSHIFT, 1);
+	gotoEndState(state);
 	return ERROR_OK;
 }
 
@@ -635,9 +652,6 @@ int interface_jtag_add_tlr()
 
 
 
-extern int jtag_nsrst_delay;
-extern int jtag_ntrst_delay;
-
 int interface_jtag_add_reset(int req_trst, int req_srst)
 {
 	zy1000_reset(req_trst, req_srst);
@@ -651,13 +665,13 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
 
 	/* execute num_cycles, 32 at the time. */
 	int i;
-	for (i=0; i<num_cycles; i+=32)
+	for (i = 0; i < num_cycles; i += 32)
 	{
 		int num;
-		num=32;
-		if (num_cycles-i<num)
+		num = 32;
+		if (num_cycles-i < num)
 		{
-			num=num_cycles-i;
+			num = num_cycles-i;
 		}
 		shiftValueInner(clockstate, clockstate, num, 0);
 	}
@@ -666,20 +680,20 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
 	/* finish in end_state */
 	setCurrentState(state);
 #else
-	tap_state_t t=TAP_IDLE;
+	tap_state_t t = TAP_IDLE;
 	/* test manual drive code on any target */
 	int tms;
-	u8 tms_scan = tap_get_tms_path(t, state);
+	uint8_t tms_scan = tap_get_tms_path(t, state);
 	int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
 	for (i = 0; i < tms_count; i++)
 	{
 		tms = (tms_scan >> i) & 1;
 		waitIdle();
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28,  tms);
 	}
 	waitIdle();
-	ZY1000_POKE(ZY1000_JTAG_BASE+0x20, state);
+	ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state);
 #endif
 
 
@@ -696,7 +710,7 @@ int interface_jtag_add_clocks(int num_cycles)
 	return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
 }
 
-int interface_jtag_add_sleep(u32 us)
+int interface_jtag_add_sleep(uint32_t us)
 {
 	jtag_sleep(us);
 	return ERROR_OK;
@@ -712,7 +726,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
 
 	state_count = 0;
 
-	tap_state_t cur_state=cmd_queue_cur_state;
+	tap_state_t cur_state = cmd_queue_cur_state;
 
 	while (num_states)
 	{
@@ -731,7 +745,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
 		}
 
 		waitIdle();
-		ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
+		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28,  tms);
 
 		cur_state = path[state_count];
 		state_count++;
@@ -739,17 +753,17 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
 	}
 
 	waitIdle();
-	ZY1000_POKE(ZY1000_JTAG_BASE+0x20,  cur_state);
+	ZY1000_POKE(ZY1000_JTAG_BASE + 0x20,  cur_state);
 	return ERROR_OK;
 }
 
 
 
-void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
+void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count)
 {
-//	static int const reg_addr=0x5;
-	tap_state_t end_state=jtag_get_end_state();
-	if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL)
+//	static int const reg_addr = 0x5;
+	tap_state_t end_state = jtag_get_end_state();
+	if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL)) == NULL)
 	{
 		/* better performance via code duplication */
 		if (little)
@@ -758,8 +772,8 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little
 			for (i = 0; i < count; i++)
 			{
 				shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1));
-				shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
-				buffer+=4;
+				shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5));
+				buffer += 4;
 			}
 		} else
 		{
@@ -767,8 +781,8 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little
 			for (i = 0; i < count; i++)
 			{
 				shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0));
-				shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
-				buffer+=4;
+				shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5));
+				buffer += 4;
 			}
 		}
 	}
@@ -783,27 +797,4 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little
 	}
 }
 
-int loadFile(const char *fileName, void **data, int *len);
-
-/* boolean parameter stored on config */
-int boolParam(char *var)
-{
-	bool result = false;
-	char *name = alloc_printf("%s/%s", zylin_config_dir, var);
-	if (name == NULL)
-		return result;
-
-	void *data;
-	int len;
-	if (loadFile(name, &data, &len) == ERROR_OK)
-	{
-		if (len > 1)
-			len = 1;
-		result = strncmp((char *) data, "1", len) == 0;
-		free(data);
-	}
-	free(name);
-	return result;
-}
-