Remove whitespace that occurs after '('.

- Replace '([ \t]*' with '('.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2376 b42882b7-edfa-0310-969c-e2dbd0fdcd60

16 files changed, 180 insertions, 180 deletions

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index c059d920..69115360 100644
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -395,20 +395,20 @@ int amt_jtagaccel_get_giveio_access(void)
 	OSVERSIONINFO version;
 
 	version.dwOSVersionInfoSize = sizeof version;
-	if (!GetVersionEx( &version )) {
+	if (!GetVersionEx(&version )) {
 	errno = EINVAL;
 	return -1;
 	}
 	if (version.dwPlatformId != VER_PLATFORM_WIN32_NT)
 	return 0;
 
-	h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+	h = CreateFile("\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
 	if (h == INVALID_HANDLE_VALUE) {
 	errno = ENODEV;
 	return -1;
 	}
 
-	CloseHandle( h );
+	CloseHandle(h );
 
 	return 0;
 }
diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index 3068a15f..cd13cff0 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -133,7 +133,7 @@ static int armjtagew_execute_queue(void)
 		switch (cmd->type)
 		{
 			case JTAG_RUNTEST:
-				DEBUG_JTAG_IO( "runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
+				DEBUG_JTAG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
 					cmd->cmd.runtest->end_state);
 
 				armjtagew_end_state(cmd->cmd.runtest->end_state);
diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 2a153b2f..47654a2d 100644
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -83,7 +83,7 @@ void bitq_in_proc(void)
 									bitq_in_bufsize *= 2;
 							}
 							/* if necessary, allocate buffer and check for malloc error */
-							if (bitq_in_buffer == NULL && ( bitq_in_buffer = malloc(bitq_in_bufsize) ) == NULL)
+							if (bitq_in_buffer == NULL && (bitq_in_buffer = malloc(bitq_in_bufsize) ) == NULL)
 							{
 								LOG_ERROR("malloc error");
 								exit(-1);
@@ -95,7 +95,7 @@ void bitq_in_proc(void)
 					/* field scanning */
 					while (bitq_in_state.bit_pos < field->num_bits)
 					{
-						if ( ( tdo = bitq_interface->in() ) < 0 )
+						if ((tdo = bitq_interface->in() ) < 0 )
 						{
 #ifdef _DEBUG_JTAG_IO_
 							LOG_DEBUG("bitq in EOF");
@@ -131,7 +131,7 @@ void bitq_io(int tms, int tdi, int tdo_req)
 {
 	bitq_interface->out(tms, tdi, tdo_req);
 	/* check and process the input queue */
-	if ( bitq_interface->in_rdy() )
+	if (bitq_interface->in_rdy() )
 		bitq_in_proc();
 }
 
@@ -183,7 +183,7 @@ void bitq_path_move(pathmove_command_t* cmd)
 			bitq_io(1, 0, 0);
 		else
 		{
-			LOG_ERROR( "BUG: %s -> %s isn't a valid TAP transition", tap_state_name(
+			LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(
 							 tap_get_state() ), tap_state_name(cmd->path[i]) );
 			exit(-1);
 		}
@@ -191,7 +191,7 @@ void bitq_path_move(pathmove_command_t* cmd)
 		tap_set_state(cmd->path[i]);
 	}
 
-	tap_set_end_state( tap_get_state() );
+	tap_set_end_state(tap_get_state() );
 }
 
 
@@ -208,8 +208,8 @@ void bitq_runtest(int num_cycles)
 		bitq_io(0, 0, 0);
 
 	/* finish in end_state */
-	if ( tap_get_state() != tap_get_end_state() )
-		bitq_state_move( tap_get_end_state() );
+	if (tap_get_state() != tap_get_end_state() )
+		bitq_state_move(tap_get_end_state() );
 }
 
 
@@ -241,7 +241,7 @@ void bitq_scan_field(scan_field_t* field, int pause)
 		out_ptr  = field->out_value;
 		for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--)
 		{
-			bitq_io(0, ( (*out_ptr) & out_mask ) != 0, tdo_req);
+			bitq_io(0, ((*out_ptr) & out_mask ) != 0, tdo_req);
 			if (out_mask == 0x80)
 			{
 				out_mask = 0x01;
@@ -251,7 +251,7 @@ void bitq_scan_field(scan_field_t* field, int pause)
 				out_mask <<= 1;
 		}
 
-		bitq_io(pause, ( (*out_ptr) & out_mask ) != 0, tdo_req);
+		bitq_io(pause, ((*out_ptr) & out_mask ) != 0, tdo_req);
 	}
 
 	if (pause)
@@ -298,12 +298,12 @@ int bitq_execute_queue(void)
 #ifdef _DEBUG_JTAG_IO_
 			LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
 #endif
-			if ( (cmd->cmd.reset->trst == 1) || ( cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST) ) )
+			if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST) ) )
 			{
 				tap_set_state(TAP_RESET);
 			}
 			bitq_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
-			if ( bitq_interface->in_rdy() )
+			if (bitq_interface->in_rdy() )
 				bitq_in_proc();
 			break;
 
@@ -320,7 +320,7 @@ int bitq_execute_queue(void)
 			LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
 #endif
 			bitq_end_state(cmd->cmd.statemove->end_state);
-			bitq_state_move( tap_get_end_state() );   /* uncoditional TAP move */
+			bitq_state_move(tap_get_end_state() );   /* uncoditional TAP move */
 			break;
 
 		case JTAG_PATHMOVE:
@@ -341,8 +341,8 @@ int bitq_execute_queue(void)
 #endif
 			bitq_end_state(cmd->cmd.scan->end_state);
 			bitq_scan(cmd->cmd.scan);
-			if ( tap_get_state() != tap_get_end_state() )
-				bitq_state_move( tap_get_end_state() );
+			if (tap_get_state() != tap_get_end_state() )
+				bitq_state_move(tap_get_end_state() );
 			break;
 
 		case JTAG_SLEEP:
@@ -350,7 +350,7 @@ int bitq_execute_queue(void)
 			LOG_DEBUG("sleep %i", cmd->cmd.sleep->us);
 #endif
 			bitq_interface->sleep(cmd->cmd.sleep->us);
-			if ( bitq_interface->in_rdy() )
+			if (bitq_interface->in_rdy() )
 				bitq_in_proc();
 			break;
 
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 4e41eb17..58c8e341 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -482,7 +482,7 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
 			return;
 		}
 
-		if ( tap_state_transition(cur_state, true)  != path[i]
+		if (tap_state_transition(cur_state, true)  != path[i]
 		  && tap_state_transition(cur_state, false) != path[i])
 		{
 			LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
@@ -503,18 +503,18 @@ int jtag_add_statemove(tap_state_t goal_state)
 {
 	tap_state_t cur_state = cmd_queue_cur_state;
 
-	LOG_DEBUG( "cur_state=%s goal_state=%s",
+	LOG_DEBUG("cur_state=%s goal_state=%s",
 		tap_state_name(cur_state),
 		tap_state_name(goal_state) );
 
 
 	if (goal_state == cur_state )
 		;	/* nothing to do */
-	else if ( goal_state == TAP_RESET )
+	else if (goal_state == TAP_RESET )
 	{
 		jtag_add_tlr();
 	}
-	else if ( tap_is_state_stable(cur_state) && tap_is_state_stable(goal_state) )
+	else if (tap_is_state_stable(cur_state) && tap_is_state_stable(goal_state) )
 	{
 		unsigned tms_bits  = tap_get_tms_path(cur_state, goal_state);
 		unsigned tms_count = tap_get_tms_path_len(cur_state, goal_state);
@@ -531,7 +531,7 @@ int jtag_add_statemove(tap_state_t goal_state)
 
 		jtag_add_pathmove(tms_count, moves);
 	}
-	else if ( tap_state_transition(cur_state, true)  == goal_state
+	else if (tap_state_transition(cur_state, true)  == goal_state
 		||   tap_state_transition(cur_state, false) == goal_state )
 	{
 		jtag_add_pathmove(1, &goal_state);
@@ -885,7 +885,7 @@ static bool jtag_idcode_is_final(uint32_t idcode)
 static void jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned max)
 {
 	bool triggered = false;
-	for ( ; count < max - 31; count += 32)
+	for (; count < max - 31; count += 32)
 	{
 		uint32_t idcode = buf_get_u32(idcodes, count, 32);
 		// do not trigger the warning if the data looks good
@@ -1026,7 +1026,7 @@ int jtag_validate_chain(void)
 	total_ir_length = 0;
 	for (;;){
 		tap = jtag_tap_next_enabled(tap);
-		if ( tap == NULL ){
+		if (tap == NULL ){
 			break;
 		}
 		total_ir_length += tap->ir_length;
@@ -1050,7 +1050,7 @@ int jtag_validate_chain(void)
 	int val;
 	for (;;){
 		tap = jtag_tap_next_enabled(tap);
-		if ( tap == NULL ){
+		if (tap == NULL ){
 			break;
 		}
 
@@ -1151,7 +1151,7 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 	LOG_DEBUG("Init JTAG chain");
 
 	tap = jtag_tap_next_enabled(NULL);
-	if ( tap == NULL ){
+	if (tap == NULL ){
 		LOG_ERROR("There are no enabled taps?");
 		return ERROR_JTAG_INIT_FAILED;
 	}
diff --git a/src/jtag/driver.c b/src/jtag/driver.c
index 1555561d..cc134284 100644
--- a/src/jtag/driver.c
+++ b/src/jtag/driver.c
@@ -418,7 +418,7 @@ int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
 	return ERROR_OK;
 }
 
-int interface_jtag_add_clocks( int num_cycles )
+int interface_jtag_add_clocks(int num_cycles )
 {
 	/* allocate memory for a new list member */
 	jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c
index 75630d96..d41725ab 100644
--- a/src/jtag/dummy.c
+++ b/src/jtag/dummy.c
@@ -85,16 +85,16 @@ static int dummy_read(void)
 static void dummy_write(int tck, int tms, int tdi)
 {
 	/* TAP standard: "state transitions occur on rising edge of clock" */
-	if ( tck != dummy_clock )
+	if (tck != dummy_clock )
 	{
-		if ( tck )
+		if (tck )
 		{
 			tap_state_t old_state = dummy_state;
-			dummy_state = tap_state_transition( old_state, tms );
+			dummy_state = tap_state_transition(old_state, tms );
 
-			if ( old_state != dummy_state )
+			if (old_state != dummy_state )
 			{
-				if ( clock_count )
+				if (clock_count )
 				{
 					LOG_DEBUG("dummy_tap: %d stable clocks", clock_count);
 					clock_count = 0;
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 5cea4d48..47a03e9a 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -876,7 +876,7 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
 			buffer_write(buffer[cur_byte]);
 	}
 
-	if (( ir_scan && (tap_get_end_state() == TAP_IRSHIFT))
+	if ((ir_scan && (tap_get_end_state() == TAP_IRSHIFT))
 	  || (!ir_scan && (tap_get_end_state() == TAP_DRSHIFT)))
 	{
 		if (type == SCAN_IO)
diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 7096d62c..63dcd627 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -422,20 +422,20 @@ static int gw16012_get_giveio_access(void)
 	OSVERSIONINFO version;
 
 	version.dwOSVersionInfoSize = sizeof version;
-	if (!GetVersionEx( &version )) {
+	if (!GetVersionEx(&version )) {
 		errno = EINVAL;
 		return -1;
 	}
 	if (version.dwPlatformId != VER_PLATFORM_WIN32_NT)
 		return 0;
 
-	h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+	h = CreateFile("\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
 	if (h == INVALID_HANDLE_VALUE) {
 		errno = ENODEV;
 		return -1;
 	}
 
-	CloseHandle( h );
+	CloseHandle(h );
 
 	return 0;
 }
diff --git a/src/jtag/interface.c b/src/jtag/interface.c
index e9998011..e856fe38 100644
--- a/src/jtag/interface.c
+++ b/src/jtag/interface.c
@@ -40,7 +40,7 @@
  */
 static tap_state_t state_follower = TAP_RESET;
 
-void tap_set_state_impl( tap_state_t new_state )
+void tap_set_state_impl(tap_state_t new_state )
 {
 	/* this is the state we think the TAPs are in now, was cur_state */
 	state_follower = new_state;
@@ -57,7 +57,7 @@ tap_state_t tap_get_state()
  */
 static tap_state_t end_state_follower = TAP_RESET;
 
-void tap_set_end_state( tap_state_t new_end_state )
+void tap_set_end_state(tap_state_t new_end_state )
 {
 	/* this is the state we think the TAPs will be in at completion of the
 	   current TAP operation, was end_state
@@ -71,13 +71,13 @@ tap_state_t tap_get_end_state()
 }
 
 
-int tap_move_ndx( tap_state_t astate )
+int tap_move_ndx(tap_state_t astate )
 {
 	/* given a stable state, return the index into the tms_seqs[] array within tap_get_tms_path() */
 
 	int ndx;
 
-	switch ( astate )
+	switch (astate )
 	{
 	case TAP_RESET:		ndx = 0;			break;
 	case TAP_DRSHIFT:	ndx = 2;			break;
@@ -86,7 +86,7 @@ int tap_move_ndx( tap_state_t astate )
 	case TAP_IRSHIFT:	ndx = 4;			break;
 	case TAP_IRPAUSE:	ndx = 5;			break;
 	default:
-		LOG_ERROR( "fatal: unstable state \"%s\" used in tap_move_ndx()", tap_state_name(astate) );
+		LOG_ERROR("fatal: unstable state \"%s\" used in tap_move_ndx()", tap_state_name(astate) );
 		exit(1);
 	}
 
@@ -193,13 +193,13 @@ typedef const struct tms_sequences tms_table[6][6];
 
 static tms_table *tms_seqs=&short_tms_seqs;
 
-int tap_get_tms_path( tap_state_t from, tap_state_t to )
+int tap_get_tms_path(tap_state_t from, tap_state_t to )
 {
 	return (*tms_seqs)[tap_move_ndx(from)][tap_move_ndx(to)].bits;
 }
 
 
-int tap_get_tms_path_len( tap_state_t from, tap_state_t to )
+int tap_get_tms_path_len(tap_state_t from, tap_state_t to )
 {
 	return (*tms_seqs)[tap_move_ndx(from)][tap_move_ndx(to)].bit_count;
 }
@@ -212,7 +212,7 @@ bool tap_is_state_stable(tap_state_t astate)
 	/*	A switch () is used because it is symbol dependent
 		(not value dependent like an array), and can also check bounds.
 	*/
-	switch ( astate )
+	switch (astate )
 	{
 	case TAP_RESET:
 	case TAP_IDLE:
@@ -278,7 +278,7 @@ tap_state_t tap_state_transition(tap_state_t cur_state, bool tms)
 			new_state = TAP_IREXIT2;
 			break;
 		default:
-			LOG_ERROR( "fatal: invalid argument cur_state=%d", cur_state );
+			LOG_ERROR("fatal: invalid argument cur_state=%d", cur_state );
 			exit(1);
 			break;
 		}
@@ -318,7 +318,7 @@ tap_state_t tap_state_transition(tap_state_t cur_state, bool tms)
 			new_state = TAP_IRPAUSE;
 			break;
 		default:
-			LOG_ERROR( "fatal: invalid argument cur_state=%d", cur_state );
+			LOG_ERROR("fatal: invalid argument cur_state=%d", cur_state );
 			exit(1);
 			break;
 		}
@@ -331,7 +331,7 @@ const char* tap_state_name(tap_state_t state)
 {
 	const char* ret;
 
-	switch ( state )
+	switch (state )
 	{
 	case TAP_RESET:		ret = "RESET";			break;
 	case TAP_IDLE:		ret = "RUN/IDLE";		break;
@@ -359,9 +359,9 @@ tap_state_t tap_state_by_name(const char *name)
 {
 	tap_state_t x;
 
-	for ( x = 0 ; x < TAP_NUM_STATES ; x++ ){
+	for (x = 0 ; x < TAP_NUM_STATES ; x++ ){
 		/* be nice to the human */
-		if ( 0 == strcasecmp( name, tap_state_name(x) ) ){
+		if (0 == strcasecmp(name, tap_state_name(x) ) ){
 			return x;
 		}
 	}
diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index 1fdd8879..a0a1ed67 100644
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -59,7 +59,7 @@ void tap_set_state_impl(tap_state_t new_state);
 #if defined(_DEBUG_JTAG_IO_)
 #define tap_set_state(new_state) \
 	do { \
-		LOG_DEBUG( "tap_set_state(%s)", tap_state_name(new_state) ); \
+		LOG_DEBUG("tap_set_state(%s)", tap_state_name(new_state) ); \
 		tap_set_state_impl(new_state); \
 	} while (0)
 #else
diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 50c08314..ec6a862f 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -263,20 +263,20 @@ static int parport_get_giveio_access(void)
 	OSVERSIONINFO version;
 
 	version.dwOSVersionInfoSize = sizeof version;
-	if (!GetVersionEx( &version )) {
+	if (!GetVersionEx(&version )) {
 		errno = EINVAL;
 		return -1;
 	}
 	if (version.dwPlatformId != VER_PLATFORM_WIN32_NT)
 		return 0;
 
-	h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+	h = CreateFile("\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
 	if (h == INVALID_HANDLE_VALUE) {
 		errno = ENODEV;
 		return -1;
 	}
 
-	CloseHandle( h );
+	CloseHandle(h );
 
 	return 0;
 }
diff --git a/src/jtag/rlink/dtc_cmd.h b/src/jtag/rlink/dtc_cmd.h
index 9070e843..04475b01 100644
--- a/src/jtag/rlink/dtc_cmd.h
+++ b/src/jtag/rlink/dtc_cmd.h
@@ -39,11 +39,11 @@
 #define DTC_CMD_SHIFT_TDIO_BYTES(bytes)	((0x6 << 4) | ((bytes) - 1))
 /* Shift 1-16 bytes out TDI and in TDO. TMS is unaffected. */
 
-#define DTC_CMD_SHIFT_TMS_TDI_BIT_PAIR(tms, tdi, tdo)	((0x8 << 4) | (	\
+#define DTC_CMD_SHIFT_TMS_TDI_BIT_PAIR(tms, tdi, tdo)	((0x8 << 4) | (\
 		(tms) ? (1 << 0) : 0	\
-	) | (	\
+	) | (\
 		(tdi) ? (1 << 1) : 0	\
-	) | (	\
+	) | (\
 		(tdo) ? (1 << 3) : 0	\
 	))
 /* Single bit shift. */
diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c
index 2f14e86f..add94580 100644
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/rlink/rlink.c
@@ -1636,26 +1636,26 @@ int rlink_init(void)
 
 		for (dev = bus->devices; dev; dev = dev->next)
 		{
-			if ( (dev->descriptor.idVendor == USB_IDVENDOR) && (dev->descriptor.idProduct == USB_IDPRODUCT) )
+			if ((dev->descriptor.idVendor == USB_IDVENDOR) && (dev->descriptor.idProduct == USB_IDPRODUCT) )
 			{
 				found = 1;
 				LOG_DEBUG("Found device on bus.\n");
 
 				do
 				{
-					if ( dev->descriptor.bNumConfigurations > 1 )
+					if (dev->descriptor.bNumConfigurations > 1 )
 					{
 						LOG_ERROR("Whoops! NumConfigurations is not 1, don't know what to do...\n");
 						break;
 					}
-					if ( dev->config->bNumInterfaces > 1 )
+					if (dev->config->bNumInterfaces > 1 )
 					{
 						LOG_ERROR("Whoops! NumInterfaces is not 1, don't know what to do...\n");
 						break;
 					}
 
 					pHDev = usb_open(dev);
-					if ( !pHDev )
+					if (!pHDev )
 						LOG_ERROR ("Failed to open device.\n");
 					else
 					{
@@ -1686,7 +1686,7 @@ int rlink_init(void)
 
 						if (!i)
 						{
-							if ( usb_set_altinterface(pHDev,0) )
+							if (usb_set_altinterface(pHDev,0) )
 							{
 								LOG_ERROR("Failed to set interface.\n");
 								break;
@@ -1700,13 +1700,13 @@ int rlink_init(void)
 		}
 	}
 
-	if ( !found )
+	if (!found )
 	{
 		LOG_ERROR("No device found on bus.\n");
 		exit(1);
 	}
 
-	if ( !success )
+	if (!success )
 	{
 		LOG_ERROR("Initialisation failed.");
 		exit(1);
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index a6f7b5dd..4422111b 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -209,7 +209,7 @@ static Jim_Nvp nvp_config_opts[] = {
 	{ .name = NULL,          .value = -1 }
 };
 
-static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap)
+static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, jtag_tap_t * tap)
 {
 	Jim_Nvp *n;
 	Jim_Obj *o;
@@ -228,11 +228,11 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap)
 		switch (n->value) {
 			case JCFG_EVENT:
 				if (goi->argc == 0) {
-					Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ..." );
+					Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ..." );
 					return JIM_ERR;
 				}
 
-				e = Jim_GetOpt_Nvp( goi, nvp_jtag_tap_event, &n );
+				e = Jim_GetOpt_Nvp(goi, nvp_jtag_tap_event, &n );
 				if (e != JIM_OK) {
 					Jim_GetOpt_NvpUnknown(goi, nvp_jtag_tap_event, 1);
 					return e;
@@ -268,7 +268,7 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap)
 							jteap = calloc(1, sizeof (*jteap));
 						}
 						jteap->event = n->value;
-						Jim_GetOpt_Obj( goi, &o);
+						Jim_GetOpt_Obj(goi, &o);
 						if (jteap->body) {
 							Jim_DecrRefCount(interp, jteap->body);
 						}
@@ -306,7 +306,7 @@ static int is_bad_irval(int ir_length, jim_wide w)
 	return (w & v) != 0;
 }
 
-static int jim_newtap_cmd( Jim_GetOptInfo *goi )
+static int jim_newtap_cmd(Jim_GetOptInfo *goi )
 {
 	jtag_tap_t *pTap;
 	jim_wide w;
@@ -340,20 +340,20 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 	/*
 	 * we expect CHIP + TAP + OPTIONS
 	 * */
-	if ( goi->argc < 3 ){
+	if (goi->argc < 3 ){
 		Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ....");
 		return JIM_ERR;
 	}
-	Jim_GetOpt_String( goi, &cp, NULL );
+	Jim_GetOpt_String(goi, &cp, NULL );
 	pTap->chip = strdup(cp);
 
-	Jim_GetOpt_String( goi, &cp, NULL );
+	Jim_GetOpt_String(goi, &cp, NULL );
 	pTap->tapname = strdup(cp);
 
 	/* name + dot + name + null */
 	x = strlen(pTap->chip) + 1 + strlen(pTap->tapname) + 1;
-	cp = malloc( x );
-	sprintf( cp, "%s.%s", pTap->chip, pTap->tapname );
+	cp = malloc(x );
+	sprintf(cp, "%s.%s", pTap->chip, pTap->tapname );
 	pTap->dotted_name = cp;
 
 	LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params",
@@ -367,14 +367,14 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 	/* clear them as we find them */
 	reqbits = (NTREQ_IRLEN | NTREQ_IRCAPTURE | NTREQ_IRMASK);
 
-	while ( goi->argc ){
-		e = Jim_GetOpt_Nvp( goi, opts, &n );
-		if ( e != JIM_OK ){
-			Jim_GetOpt_NvpUnknown( goi, opts, 0 );
+	while (goi->argc ){
+		e = Jim_GetOpt_Nvp(goi, opts, &n );
+		if (e != JIM_OK ){
+			Jim_GetOpt_NvpUnknown(goi, opts, 0 );
 			return e;
 		}
 		LOG_DEBUG("Processing option: %s", n->name );
-		switch ( n->value ){
+		switch (n->value ){
 		case NTAP_OPT_ENABLED:
 			pTap->disabled_after_reset = false;
 			break;
@@ -385,15 +385,15 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 		{
 			uint32_t *new_expected_ids;
 
-			e = Jim_GetOpt_Wide( goi, &w );
-			if ( e != JIM_OK) {
+			e = Jim_GetOpt_Wide(goi, &w );
+			if (e != JIM_OK) {
 				Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
 				return e;
 			}
 
 			new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1));
 			if (new_expected_ids == NULL) {
-				Jim_SetResult_sprintf( goi->interp, "no memory");
+				Jim_SetResult_sprintf(goi->interp, "no memory");
 				return JIM_ERR;
 			}
 
@@ -409,9 +409,9 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 		case NTAP_OPT_IRLEN:
 		case NTAP_OPT_IRMASK:
 		case NTAP_OPT_IRCAPTURE:
-			e = Jim_GetOpt_Wide( goi, &w );
-			if ( e != JIM_OK ){
-				Jim_SetResult_sprintf( goi->interp, "option: %s bad parameter", n->name );
+			e = Jim_GetOpt_Wide(goi, &w );
+			if (e != JIM_OK ){
+				Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name );
 				return e;
 			}
 			switch (n->value){
@@ -441,7 +441,7 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 				break;
 			}
 		} /* switch (n->value) */
-	} /* while ( goi->argc ) */
+	} /* while (goi->argc ) */
 
 	/* default is enabled-after-reset */
 	pTap->enabled = !pTap->disabled_after_reset;
@@ -471,7 +471,7 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e)
 	while (jteap) {
 		if (jteap->event == e) {
 			done = 1;
-			LOG_DEBUG( "JTAG tap: %s event: %d (%s) action: %s\n",
+			LOG_DEBUG("JTAG tap: %s event: %d (%s) action: %s\n",
 					tap->dotted_name,
 					e,
 					Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name,
@@ -491,14 +491,14 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e)
 	}
 
 	if (!done) {
-		LOG_DEBUG( "event %d %s - no action",
+		LOG_DEBUG("event %d %s - no action",
 				e,
-				Jim_Nvp_value2name_simple( nvp_jtag_tap_event, e)->name);
+				Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name);
 	}
 }
 
 
-static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 {
 	Jim_GetOptInfo goi;
 	int e;
@@ -532,44 +532,44 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv
 
 	context = Jim_GetAssocData(interp, "context");
 	/* go past the command */
-	Jim_GetOpt_Setup( &goi, interp, argc-1, argv + 1 );
+	Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1 );
 
-	e = Jim_GetOpt_Nvp( &goi, jtag_cmds, &n );
-	if ( e != JIM_OK ){
-		Jim_GetOpt_NvpUnknown( &goi, jtag_cmds, 0 );
+	e = Jim_GetOpt_Nvp(&goi, jtag_cmds, &n );
+	if (e != JIM_OK ){
+		Jim_GetOpt_NvpUnknown(&goi, jtag_cmds, 0 );
 		return e;
 	}
-		Jim_SetEmptyResult( goi.interp );
-	switch ( n->value ){
+		Jim_SetEmptyResult(goi.interp );
+	switch (n->value ){
 	case JTAG_CMD_INTERFACE:
 		/* return the name of the interface */
 		/* TCL code might need to know the exact type... */
 		/* FUTURE: we allow this as a means to "set" the interface. */
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)");
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
 			return JIM_ERR;
 		}
-		Jim_SetResultString( goi.interp, jtag_interface->name, -1 );
+		Jim_SetResultString(goi.interp, jtag_interface->name, -1 );
 		return JIM_OK;
 	case JTAG_CMD_INIT_RESET:
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)");
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
 			return JIM_ERR;
 		}
 		e = jtag_init_reset(context);
-		if ( e != ERROR_OK ){
-			Jim_SetResult_sprintf( goi.interp, "error: %d", e);
+		if (e != ERROR_OK ){
+			Jim_SetResult_sprintf(goi.interp, "error: %d", e);
 			return JIM_ERR;
 		}
 		return JIM_OK;
 	case JTAG_CMD_NEWTAP:
-		return jim_newtap_cmd( &goi );
+		return jim_newtap_cmd(&goi );
 		break;
 	case JTAG_CMD_TAPISENABLED:
 	case JTAG_CMD_TAPENABLE:
 	case JTAG_CMD_TAPDISABLE:
-		if ( goi.argc != 1 ){
-			Jim_SetResultString( goi.interp, "Too many parameters",-1 );
+		if (goi.argc != 1 ){
+			Jim_SetResultString(goi.interp, "Too many parameters",-1 );
 			return JIM_ERR;
 		}
 
@@ -619,8 +619,8 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv
 		break;
 
 	case JTAG_CMD_CGET:
-		if ( goi.argc < 2 ){
-			Jim_WrongNumArgs( goi.interp, 0, NULL, "?tap-name? -option ...");
+		if (goi.argc < 2 ){
+			Jim_WrongNumArgs(goi.interp, 0, NULL, "?tap-name? -option ...");
 			return JIM_ERR;
 		}
 
@@ -628,19 +628,19 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv
 			jtag_tap_t *t;
 
 			Jim_GetOpt_Obj(&goi, &o);
-			t = jtag_tap_by_jim_obj( goi.interp, o );
-			if ( t == NULL ){
+			t = jtag_tap_by_jim_obj(goi.interp, o );
+			if (t == NULL ){
 				return JIM_ERR;
 			}
 
 			goi.isconfigure = 0;
-			return jtag_tap_configure_cmd( &goi, t);
+			return jtag_tap_configure_cmd(&goi, t);
 		}
 		break;
 
 	case JTAG_CMD_CONFIGURE:
-		if ( goi.argc < 3 ){
-			Jim_WrongNumArgs( goi.interp, 0, NULL, "?tap-name? -option ?VALUE? ...");
+		if (goi.argc < 3 ){
+			Jim_WrongNumArgs(goi.interp, 0, NULL, "?tap-name? -option ?VALUE? ...");
 			return JIM_ERR;
 		}
 
@@ -648,13 +648,13 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv
 			jtag_tap_t *t;
 
 			Jim_GetOpt_Obj(&goi, &o);
-			t = jtag_tap_by_jim_obj( goi.interp, o );
-			if ( t == NULL ){
+			t = jtag_tap_by_jim_obj(goi.interp, o );
+			if (t == NULL ){
 				return JIM_ERR;
 			}
 
 			goi.isconfigure = 1;
-			return jtag_tap_configure_cmd( &goi, t);
+			return jtag_tap_configure_cmd(&goi, t);
 		}
 	}
 
@@ -663,7 +663,7 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv
 
 int jtag_register_commands(struct command_context_s *cmd_ctx)
 {
-	register_jim( cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions");
+	register_jim(cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions");
 
 	register_command(cmd_ctx, NULL, "interface", handle_interface_command,
 		COMMAND_CONFIG, "try to configure interface");
@@ -806,49 +806,49 @@ static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *c
 	 * argv[ 3] = not actually used by anything but in the docs
 	 */
 
-	if ( argc < 4 ){
-		command_print( cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax");
+	if (argc < 4 ){
+		command_print(cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax");
 		return ERROR_OK;
 	}
-	command_print( cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax");
-	command_print( cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s",
+	command_print(cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax");
+	command_print(cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s",
 				   args[0],
 				   args[1],
 				   args[2] );
-	command_print( cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundaryscan(len5)");
-	command_print( cmd_ctx, "jtag newtap stm32 cortexm3 ....., thus creating the tap: \"stm32.cortexm3\"");
-	command_print( cmd_ctx, "jtag newtap stm32 boundary ....., and the tap: \"stm32.boundary\"");
-	command_print( cmd_ctx, "And then refer to the taps by the dotted name.");
-
-	newargs[0] = Jim_NewStringObj( interp, "jtag", -1   );
-	newargs[1] = Jim_NewStringObj( interp, "newtap", -1 );
-	sprintf( buf, "chip%d", jtag_tap_count() );
-	newargs[2] = Jim_NewStringObj( interp, buf, -1 );
-	sprintf( buf, "tap%d", jtag_tap_count() );
-	newargs[3] = Jim_NewStringObj( interp, buf, -1  );
-	newargs[4] = Jim_NewStringObj( interp, "-irlen", -1  );
-	newargs[5] = Jim_NewStringObj( interp, args[0], -1  );
-	newargs[6] = Jim_NewStringObj( interp, "-ircapture", -1  );
-	newargs[7] = Jim_NewStringObj( interp, args[1], -1  );
-	newargs[8] = Jim_NewStringObj( interp, "-irmask", -1  );
-	newargs[9] = Jim_NewStringObj( interp, args[2], -1  );
-
-	command_print( cmd_ctx, "NEW COMMAND:");
-	sprintf( buf, "%s %s %s %s %s %s %s %s %s %s",
-			 Jim_GetString( newargs[0], NULL ),
-			 Jim_GetString( newargs[1], NULL ),
-			 Jim_GetString( newargs[2], NULL ),
-			 Jim_GetString( newargs[3], NULL ),
-			 Jim_GetString( newargs[4], NULL ),
-			 Jim_GetString( newargs[5], NULL ),
-			 Jim_GetString( newargs[6], NULL ),
-			 Jim_GetString( newargs[7], NULL ),
-			 Jim_GetString( newargs[8], NULL ),
-			 Jim_GetString( newargs[9], NULL ) );
-
-	e = jim_jtag_command( interp, 10, newargs );
-	if ( e != JIM_OK ){
-		command_print( cmd_ctx, "%s", Jim_GetString( Jim_GetResult(interp), NULL ) );
+	command_print(cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundaryscan(len5)");
+	command_print(cmd_ctx, "jtag newtap stm32 cortexm3 ....., thus creating the tap: \"stm32.cortexm3\"");
+	command_print(cmd_ctx, "jtag newtap stm32 boundary ....., and the tap: \"stm32.boundary\"");
+	command_print(cmd_ctx, "And then refer to the taps by the dotted name.");
+
+	newargs[0] = Jim_NewStringObj(interp, "jtag", -1   );
+	newargs[1] = Jim_NewStringObj(interp, "newtap", -1 );
+	sprintf(buf, "chip%d", jtag_tap_count() );
+	newargs[2] = Jim_NewStringObj(interp, buf, -1 );
+	sprintf(buf, "tap%d", jtag_tap_count() );
+	newargs[3] = Jim_NewStringObj(interp, buf, -1  );
+	newargs[4] = Jim_NewStringObj(interp, "-irlen", -1  );
+	newargs[5] = Jim_NewStringObj(interp, args[0], -1  );
+	newargs[6] = Jim_NewStringObj(interp, "-ircapture", -1  );
+	newargs[7] = Jim_NewStringObj(interp, args[1], -1  );
+	newargs[8] = Jim_NewStringObj(interp, "-irmask", -1  );
+	newargs[9] = Jim_NewStringObj(interp, args[2], -1  );
+
+	command_print(cmd_ctx, "NEW COMMAND:");
+	sprintf(buf, "%s %s %s %s %s %s %s %s %s %s",
+			 Jim_GetString(newargs[0], NULL ),
+			 Jim_GetString(newargs[1], NULL ),
+			 Jim_GetString(newargs[2], NULL ),
+			 Jim_GetString(newargs[3], NULL ),
+			 Jim_GetString(newargs[4], NULL ),
+			 Jim_GetString(newargs[5], NULL ),
+			 Jim_GetString(newargs[6], NULL ),
+			 Jim_GetString(newargs[7], NULL ),
+			 Jim_GetString(newargs[8], NULL ),
+			 Jim_GetString(newargs[9], NULL ) );
+
+	e = jim_jtag_command(interp, 10, newargs );
+	if (e != JIM_OK ){
+		command_print(cmd_ctx, "%s", Jim_GetString(Jim_GetResult(interp), NULL ) );
 	}
 	return e;
 }
@@ -861,7 +861,7 @@ static int handle_scan_chain_command(struct command_context_s *cmd_ctx, char *cm
 	command_print(cmd_ctx, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
 	command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
 
-	while ( tap ){
+	while (tap ){
 		uint32_t expected, expected_mask, cur_instr, ii;
 		expected = buf_get_u32(tap->expected, 0, tap->ir_length);
 		expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
@@ -1174,20 +1174,20 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c
 	 */
 	endstate = TAP_IDLE;
 
-	if ( argc >= 4 ){
+	if (argc >= 4 ){
 		/* have at least one pair of numbers. */
 		/* is last pair the magic text? */
-		if ( 0 == strcmp( "-endstate", args[ argc - 2 ] ) ){
+		if (0 == strcmp("-endstate", args[ argc - 2 ] ) ){
 			const char *cpA;
 			const char *cpS;
 			cpA = args[ argc-1 ];
-			for ( endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){
-				cpS = tap_state_name( endstate );
-				if ( 0 == strcmp( cpA, cpS ) ){
+			for (endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){
+				cpS = tap_state_name(endstate );
+				if (0 == strcmp(cpA, cpS ) ){
 					break;
 				}
 			}
-			if ( endstate >= TAP_NUM_STATES ){
+			if (endstate >= TAP_NUM_STATES ){
 				return ERROR_COMMAND_SYNTAX_ERROR;
 			} else {
 				if (!scan_is_safe(endstate))
@@ -1207,10 +1207,10 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c
 	int retval;
 	for (i = 0; i < num_fields; i++)
 	{
-		tap = jtag_tap_by_string( args[i*2] );
+		tap = jtag_tap_by_string(args[i*2] );
 		if (tap == NULL)
 		{
-			command_print( cmd_ctx, "Tap: %s unknown", args[i*2] );
+			command_print(cmd_ctx, "Tap: %s unknown", args[i*2] );
 			return ERROR_FAIL;
 		}
 		int field_size = tap->ir_length;
@@ -1281,12 +1281,12 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
 
 		e = Jim_GetLong(interp, args[i], &bits);
 		/* If valid - try next arg */
-		if ( e == JIM_OK ){
+		if (e == JIM_OK ){
 			continue;
 		}
 
 		/* Not valid.. are we at the end? */
-		if ( ((i + 2) != argc) ){
+		if (((i + 2) != argc) ){
 			/* nope, then error */
 			return e;
 		}
@@ -1297,15 +1297,15 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
 		 */
 
 		/* get arg as a string. */
-		cp = Jim_GetString( args[i], NULL );
+		cp = Jim_GetString(args[i], NULL );
 		/* is it the magic? */
-		if ( 0 == strcmp( "-endstate", cp ) ){
+		if (0 == strcmp("-endstate", cp ) ){
 			/* is the statename valid? */
-			cp = Jim_GetString( args[i + 1], NULL );
+			cp = Jim_GetString(args[i + 1], NULL );
 
 			/* see if it is a valid state name */
 			endstate = tap_state_by_name(cp);
-			if ( endstate < 0 ){
+			if (endstate < 0 ){
 				/* update the error message */
 				Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp );
 			} else {
@@ -1321,13 +1321,13 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
 		}
 
 		/* Still an error? */
-		if ( e != JIM_OK ){
+		if (e != JIM_OK ){
 			return e; /* too bad */
 		}
 	} /* validate args */
 
-	tap = jtag_tap_by_jim_obj( interp, args[1] );
-	if ( tap == NULL ){
+	tap = jtag_tap_by_jim_obj(interp, args[1] );
+	if (tap == NULL ){
 		return JIM_ERR;
 	}
 
@@ -1399,9 +1399,9 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar
 	for (i = 0; i < argc-1; i++)
 	{
 		const char *cp;
-		cp = Jim_GetString( args[i + 1], NULL );
+		cp = Jim_GetString(args[i + 1], NULL );
 		states[i] = tap_state_by_name(cp);
-		if ( states[i] < 0 )
+		if (states[i] < 0 )
 		{
 			/* update the error message */
 			Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp );
@@ -1409,7 +1409,7 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar
 		}
 	}
 
-	if ((jtag_add_statemove(states[0]) != ERROR_OK) || ( jtag_execute_queue()!= ERROR_OK))
+	if ((jtag_add_statemove(states[0]) != ERROR_OK) || (jtag_execute_queue()!= ERROR_OK))
 	{
 		Jim_SetResultString(interp, "pathmove: jtag execute failed",-1);
 		return JIM_ERR;
diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index 41a91909..56f92abe 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -298,7 +298,7 @@ static int vsllink_execute_queue(void)
 		switch (cmd->type)
 		{
 			case JTAG_RUNTEST:
-				DEBUG_JTAG_IO( "runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, \
+				DEBUG_JTAG_IO("runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, \
 					tap_state_name(cmd->cmd.runtest->end_state));
 
 				vsllink_end_state(cmd->cmd.runtest->end_state);
@@ -377,7 +377,7 @@ static int vsllink_execute_queue(void)
 					scan_size = 0;
 					break;			/* above stable states are OK */
 				default:
-					 LOG_ERROR( "jtag_add_clocks() was called with TAP in non-stable state \"%s\"",
+					 LOG_ERROR("jtag_add_clocks() was called with TAP in non-stable state \"%s\"",
 							 tap_state_name(tap_get_state()) );
 					 exit(-1);
 				}
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 103a692c..cd950c30 100644
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -26,7 +26,7 @@
 #define TEST_MANUAL() 0
 
 #if 0
-int  diag_printf( const char *fmt, ... );
+int  diag_printf(const char *fmt, ... );
 #define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b); diag_printf("poke 0x%08x,0x%08x\n", a, b)
 #define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b); diag_printf("peek 0x%08x = 0x%08x\n", a, b)
 #else