Remove whitespace that occurs after '('.

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


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

27 files changed, 368 insertions, 368 deletions

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 54289d7c..77ff6dc0 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -709,7 +709,7 @@ int arm11_arch_state(struct target_s *target)
 	arm11_common_t * arm11 = target->arch_info;
 
 	LOG_USER("target halted due to %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
-			 Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name,
+			 Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name,
 			 R(CPSR),
 			 R(PC));
 
@@ -732,7 +732,7 @@ int arm11_halt(struct target_s *target)
 	arm11_common_t * arm11 = target->arch_info;
 
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name );
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
 
 	if (target->state == TARGET_UNKNOWN)
 	{
@@ -789,7 +789,7 @@ int arm11_resume(struct target_s *target, int current, uint32_t address, int han
 	arm11_common_t * arm11 = target->arch_info;
 
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name );
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
 
 
 	if (target->state != TARGET_HALTED)
@@ -889,7 +889,7 @@ int arm11_step(struct target_s *target, int current, uint32_t address, int handl
 	FNC_INFO;
 
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name );
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
 
 	if (target->state != TARGET_HALTED)
 	{
@@ -1035,7 +1035,7 @@ int arm11_deassert_reset(struct target_s *target)
 
 #if 0
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name );
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
 
 
 	/* deassert reset lines */
@@ -1951,30 +1951,30 @@ int arm11_register_commands(struct command_context_s *cmd_ctx)
 
 	command_t * top_cmd = NULL;
 
-	RC_TOP(				"arm11",				"arm11 specific commands",
+	RC_TOP("arm11",				"arm11 specific commands",
 
-	RC_TOP(				"memwrite",				"Control memory write transfer mode",
+	RC_TOP("memwrite",				"Control memory write transfer mode",
 
-		RC_FINAL_BOOL(	"burst",				"Enable/Disable non-standard but fast burst mode (default: enabled)",
+		RC_FINAL_BOOL("burst",				"Enable/Disable non-standard but fast burst mode (default: enabled)",
 						memwrite_burst)
 
-		RC_FINAL_BOOL(	"error_fatal",			"Terminate program if transfer error was found (default: enabled)",
+		RC_FINAL_BOOL("error_fatal",			"Terminate program if transfer error was found (default: enabled)",
 						memwrite_error_fatal)
 	) /* memwrite */
 
-	RC_FINAL_BOOL(		"no_increment",			"Don't increment address on multi-read/-write (default: disabled)",
+	RC_FINAL_BOOL("no_increment",			"Don't increment address on multi-read/-write (default: disabled)",
 						memrw_no_increment)
 
-	RC_FINAL_BOOL(		"step_irq_enable",		"Enable interrupts while stepping (default: disabled)",
+	RC_FINAL_BOOL("step_irq_enable",		"Enable interrupts while stepping (default: disabled)",
 						step_irq_enable)
 
-	RC_FINAL(			"vcr",					"Control (Interrupt) Vector Catch Register",
+	RC_FINAL("vcr",					"Control (Interrupt) Vector Catch Register",
 						arm11_handle_vcr)
 
-	RC_FINAL(			"mrc",					"Read Coprocessor register",
+	RC_FINAL("mrc",					"Read Coprocessor register",
 						arm11_handle_mrc)
 
-	RC_FINAL(			"mcr",					"Write Coprocessor register",
+	RC_FINAL("mcr",					"Write Coprocessor register",
 						arm11_handle_mcr)
 	) /* arm11 */
 
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 49bdb887..4e9e6fd7 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -319,7 +319,7 @@ int arm720t_arch_state(struct target_s *target)
 			"cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
 			"MMU: %s, Cache: %s",
 			 armv4_5_state_strings[armv4_5->core_state],
-			 Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name ,
+			 Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name ,
 			 armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
 			 buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
 			 buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 266b7bf4..b6fd6970 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -526,7 +526,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE], watchpoint->address);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], mask);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], watchpoint->mask);
-		if ( watchpoint->mask != 0xffffffffu )
+		if (watchpoint->mask != 0xffffffffu )
 			embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_VALUE], watchpoint->value);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], 0xff & ~EICE_W_CTRL_nOPC & ~rw_mask);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE | EICE_W_CTRL_nOPC | (watchpoint->rw & 1));
@@ -543,7 +543,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_VALUE], watchpoint->address);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_MASK], mask);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_MASK], watchpoint->mask);
-		if ( watchpoint->mask != 0xffffffffu )
+		if (watchpoint->mask != 0xffffffffu )
 			embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_VALUE], watchpoint->value);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], 0xff & ~EICE_W_CTRL_nOPC & ~rw_mask);
 		embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], EICE_W_CTRL_ENABLE | EICE_W_CTRL_nOPC | (watchpoint->rw & 1));
@@ -974,7 +974,7 @@ int arm7_9_assert_reset(target_t *target)
 	armv4_5_common_t *armv4_5 = target->arch_info;
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 	LOG_DEBUG("target->state: %s",
-		  Jim_Nvp_value2name_simple( nvp_target_state,target->state)->name);
+		  Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
 
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
 	if (!(jtag_reset_config & RESET_HAS_SRST))
@@ -1044,7 +1044,7 @@ int arm7_9_deassert_reset(target_t *target)
 {
 	int retval = ERROR_OK;
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state,target->state)->name);
+		Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
 
 	/* deassert reset lines */
 	jtag_add_reset(0, 0);
@@ -1257,7 +1257,7 @@ int arm7_9_halt(target_t *target)
 	reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
 
 	LOG_DEBUG("target->state: %s",
-		  Jim_Nvp_value2name_simple( nvp_target_state,target->state)->name);
+		  Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
 
 	if (target->state == TARGET_HALTED)
 	{
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index ba533a41..c94d974b 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -822,7 +822,7 @@ int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_
 	return ERROR_OK;
 }
 
-int arm7tdmi_target_create( struct target_s *target, Jim_Interp *interp )
+int arm7tdmi_target_create(struct target_s *target, Jim_Interp *interp )
 {
 	arm7tdmi_common_t *arm7tdmi;
 
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 92cee83c..3d119bd6 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -497,7 +497,7 @@ int arm920t_arch_state(struct target_s *target)
 		exit(-1);
 	}
 
-	LOG_USER(	"target halted in %s state due to %s, current mode: %s\n"
+	LOG_USER("target halted in %s state due to %s, current mode: %s\n"
 			"cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
 			"MMU: %s, D-Cache: %s, I-Cache: %s",
 			 armv4_5_state_strings[armv4_5->core_state],
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 04981abe..589dfdea 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -547,7 +547,7 @@ int arm926ejs_arch_state(struct target_s *target)
 			"cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
 			"MMU: %s, D-Cache: %s, I-Cache: %s",
 			 armv4_5_state_strings[armv4_5->core_state],
-			 Jim_Nvp_value2name_simple( nvp_target_debug_reason,target->debug_reason)->name,
+			 Jim_Nvp_value2name_simple(nvp_target_debug_reason,target->debug_reason)->name,
 			 armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
 			 buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
 			 buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 67ff8a6b..5409fd34 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -110,7 +110,7 @@ int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap
 	return ERROR_OK;
 }
 
-int arm966e_target_create( struct target_s *target, Jim_Interp *interp )
+int arm966e_target_create(struct target_s *target, Jim_Interp *interp )
 {
 	arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
 
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 3179a613..e4fc06e2 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -39,7 +39,7 @@
 int handle_arm9tdmi_catch_vectors_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 /* forward declarations */
-int arm9tdmi_target_create( struct target_s *target, Jim_Interp *interp );
+int arm9tdmi_target_create(struct target_s *target, Jim_Interp *interp );
 
 int arm9tdmi_quit(void);
 
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 0466ff5b..01b7e0cb 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -107,7 +107,7 @@ typedef struct swjdp_common_s
 /* Accessor function for currently selected DAP-AP number */ 
 static inline uint8_t dap_ap_get_select(swjdp_common_t *swjdp)
 {
-	return (uint8_t)( swjdp ->apsel >> 24);
+	return (uint8_t)(swjdp ->apsel >> 24);
 }
 
 /* Internal functions used in the module, partial transactions, use with caution */
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 77ca2e25..e1b137f9 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -299,7 +299,7 @@ int armv4_5_arch_state(struct target_s *target)
 
 	LOG_USER("target halted in %s state due to %s, current mode: %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
 			 armv4_5_state_strings[armv4_5->core_state],
-			 Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name,
+			 Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name,
 			 armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
 			 buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
 			 buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 3f162f58..b93dda36 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -462,7 +462,7 @@ int armv7m_arch_state(struct target_s *target)
 	armv7m_common_t *armv7m = target->arch_info;
 
 	LOG_USER("target halted due to %s, current mode: %s %s\nxPSR: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
-		 Jim_Nvp_value2name_simple( nvp_target_debug_reason,target->debug_reason)->name,
+		 Jim_Nvp_value2name_simple(nvp_target_debug_reason,target->debug_reason)->name,
 		armv7m_mode_strings[armv7m->core_mode],
 		armv7m_exception_string(armv7m->exception_number),
 		buf_get_u32(armv7m->core_cache->reg_list[ARMV7M_xPSR].value, 0, 32),
diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 6c751332..e3087cd9 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -144,7 +144,7 @@ extern int armv7m_blank_check_memory(struct target_s *target, uint32_t address,
  * Rd: source register
  * SYSm: destination special register
  */
-#define ARMV7M_T_MSR(SYSm, Rn)	((0xF380 | ( Rn << 8 )) | ((0x8800 | SYSm) << 16)) 
+#define ARMV7M_T_MSR(SYSm, Rn)	((0xF380 | (Rn << 8 )) | ((0x8800 | SYSm) << 16)) 
 
 /* Change Processor State. The instruction modifies the PRIMASK and FAULTMASK 
  * special-purpose register values  (Thumb mode) 16 bit Thumb2 instruction
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 477223bd..52b60eb5 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -87,7 +87,7 @@ int cortex_a8_dcc_read(swjdp_common_t *swjdp, uint8_t *value, uint8_t *ctrl)
 {
 	uint16_t dcrdr;
 
-	mem_ap_read_buf_u16( swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
+	mem_ap_read_buf_u16(swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
 	*ctrl = (uint8_t)dcrdr;
 	*value = (uint8_t)(dcrdr >> 8);
 
@@ -98,7 +98,7 @@ int cortex_a8_dcc_read(swjdp_common_t *swjdp, uint8_t *value, uint8_t *ctrl)
 	if (dcrdr & (1 << 0))
 	{
 		dcrdr = 0;
-		mem_ap_write_buf_u16( swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
+		mem_ap_write_buf_u16(swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
 	}
 
 	return ERROR_OK;
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 9f4ef523..4fe4acc5 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -444,7 +444,7 @@ int cortex_m3_debug_entry(target_t *target)
 	LOG_DEBUG("entered debug state in core mode: %s at PC 0x%" PRIx32 ", target->state: %s",
 		armv7m_mode_strings[armv7m->core_mode],
 		*(uint32_t*)(armv7m->core_cache->reg_list[15].value),
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	if (armv7m->post_debug_entry)
 		armv7m->post_debug_entry(target);
@@ -520,7 +520,7 @@ int cortex_m3_poll(target_t *target)
 #if 0
 	/* Read Debug Fault Status Register, added to figure out the lockup when running flashtest.script  */
 	mem_ap_read_atomic_u32(swjdp, NVIC_DFSR, &cortex_m3->nvic_dfsr);
-	LOG_DEBUG("dcb_dhcsr 0x%x, nvic_dfsr 0x%x, target->state: %s", cortex_m3->dcb_dhcsr, cortex_m3->nvic_dfsr, Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name );
+	LOG_DEBUG("dcb_dhcsr 0x%x, nvic_dfsr 0x%x, target->state: %s", cortex_m3->dcb_dhcsr, cortex_m3->nvic_dfsr, Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
 #endif
 
 	return ERROR_OK;
@@ -751,7 +751,7 @@ int cortex_m3_assert_reset(target_t *target)
 	int assert_srst = 1;
 
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name );
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
 
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
 	if (!(jtag_reset_config & RESET_HAS_SRST))
@@ -1491,7 +1491,7 @@ int cortex_m3_dcc_read(swjdp_common_t *swjdp, uint8_t *value, uint8_t *ctrl)
 {
 	uint16_t dcrdr;
 
-	mem_ap_read_buf_u16( swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
+	mem_ap_read_buf_u16(swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
 	*ctrl = (uint8_t)dcrdr;
 	*value = (uint8_t)(dcrdr >> 8);
 
@@ -1502,7 +1502,7 @@ int cortex_m3_dcc_read(swjdp_common_t *swjdp, uint8_t *value, uint8_t *ctrl)
 	if (dcrdr & (1 << 0))
 	{
 		dcrdr = 0;
-		mem_ap_write_buf_u16( swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
+		mem_ap_write_buf_u16(swjdp, (uint8_t*)&dcrdr, 1, DCB_DCRDR);
 	}
 
 	return ERROR_OK;
diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 4f6a33c8..5ed66603 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -108,7 +108,7 @@ extern int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, uint32_t time
 /* If many embeddedice_write_reg() follow eachother, then the >1 invocations can be this faster version of
  * embeddedice_write_reg
  */
-static __inline__ void embeddedice_write_reg_inner( jtag_tap_t *tap, int reg_addr, uint32_t value)
+static __inline__ void embeddedice_write_reg_inner(jtag_tap_t *tap, int reg_addr, uint32_t value)
 {
 	static const int embeddedice_num_bits[]={32,5,1};
 	uint32_t values[3];
@@ -117,7 +117,7 @@ static __inline__ void embeddedice_write_reg_inner( jtag_tap_t *tap, int reg_add
 	values[1]=reg_addr;
 	values[2]=1;
 
-	jtag_add_dr_out( tap,
+	jtag_add_dr_out(tap,
 			3,
 			embeddedice_num_bits,
 			values,
diff --git a/src/target/etb.c b/src/target/etb.c
index ad6eb03e..0e16b22b 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -387,7 +387,7 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
 		return ERROR_FAIL;
 	}
 
-	tap = jtag_tap_by_string( args[1] );
+	tap = jtag_tap_by_string(args[1] );
 	if (tap == NULL)
 	{
 		command_print(cmd_ctx, "Tap: %s does not exist", args[1] );
diff --git a/src/target/image.c b/src/target/image.c
index 0ffa5fd3..ea9f3d34 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -533,7 +533,7 @@ static int image_mot_buffer_complete(image_t *image)
 		}
 		else if (record_type >= 1 && record_type <= 3)
 		{
-			switch ( record_type )
+			switch (record_type )
 			{
 				case 1:
 					/* S1 - 16 bit address data record */
@@ -636,7 +636,7 @@ static int image_mot_buffer_complete(image_t *image)
 		cal_checksum += (uint8_t)checksum;
 		bytes_read += 2;
 
-		if ( cal_checksum != 0xFF )
+		if (cal_checksum != 0xFF )
 		{
 			/* checksum failed */
 			LOG_ERROR("incorrect record checksum found in S19 file");
diff --git a/src/target/mips32.c b/src/target/mips32.c
index aa6d921c..b5131c3c 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -265,7 +265,7 @@ int mips32_arch_state(struct target_s *target)
 	}
 	
 	LOG_USER("target halted due to %s, pc: 0x%8.8" PRIx32 "",
-		Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name ,
+		Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name ,
 		buf_get_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32));
 	
 	return ERROR_OK;
diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index d7d5995f..55755065 100644
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -207,7 +207,7 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, uint32_t address)
 	return ERROR_OK;
 }
 
-int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, uint32_t *code, int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle)
+int mips32_pracc_exec(mips_ejtag_t *ejtag_info, int code_len, uint32_t *code, int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle)
 {
 	uint32_t ejtag_ctrl;
 	uint32_t address, data;
diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h
index 3ff4cf20..e9b53ed1 100644
--- a/src/target/mips32_pracc.h
+++ b/src/target/mips32_pracc.h
@@ -35,7 +35,7 @@
 #define UPPER16(uint32_t) (uint32_t >> 16)
 #define LOWER16(uint32_t) (uint32_t & 0xFFFF)
 #define NEG16(v) (((~(v)) + 1) & 0xFFFF)
-/*#define NEG18(v) ( ((~(v)) + 1) & 0x3FFFF )*/
+/*#define NEG18(v) (((~(v)) + 1) & 0x3FFFF )*/
 
 extern int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int count, void *buf);
 extern int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int count, void *buf);
@@ -53,6 +53,6 @@ extern int mips32_pracc_write_u32(mips_ejtag_t *ejtag_info, uint32_t addr, uint3
 extern int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, uint32_t *regs);
 extern int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, uint32_t *regs);
 
-extern int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, uint32_t *code, int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle);
+extern int mips32_pracc_exec(mips_ejtag_t *ejtag_info, int code_len, uint32_t *code, int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle);
 
 #endif
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 0fef0772..b8c032d9 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -148,7 +148,7 @@ int mips_m4k_debug_entry(target_t *target)
 
 	LOG_DEBUG("entered debug state at PC 0x%" PRIx32 ", target->state: %s",
 		*(uint32_t*)(mips32->core_cache->reg_list[MIPS32_PC].value),
-		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		  Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	return ERROR_OK;
 }
@@ -220,7 +220,7 @@ int mips_m4k_halt(struct target_s *target)
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	LOG_DEBUG("target->state: %s",
-		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		  Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	if (target->state == TARGET_HALTED)
 	{
@@ -265,7 +265,7 @@ int mips_m4k_assert_reset(target_t *target)
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
 	if (!(jtag_reset_config & RESET_HAS_SRST))
@@ -324,7 +324,7 @@ int mips_m4k_assert_reset(target_t *target)
 int mips_m4k_deassert_reset(target_t *target)
 {
 	LOG_DEBUG("target->state: %s",
-		Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	/* deassert reset lines */
 	jtag_add_reset(0, 0);
diff --git a/src/target/target.c b/src/target/target.c
index 6f83d2e1..ccb050a7 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -70,7 +70,7 @@ static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd
 
 static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
 static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
-static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv);
+static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
 
 static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv);
 static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv);
@@ -139,12 +139,12 @@ const Jim_Nvp nvp_error_target[] = {
 	{ .value = -1, .name = NULL }
 };
 
-const char *target_strerror_safe( int err )
+const char *target_strerror_safe(int err )
 {
 	const Jim_Nvp *n;
 
-	n = Jim_Nvp_value2name_simple( nvp_error_target, err );
-	if ( n->name == NULL ){
+	n = Jim_Nvp_value2name_simple(nvp_error_target, err );
+	if (n->name == NULL ){
 		return "unknown";
 	} else {
 		return n->name;
@@ -244,8 +244,8 @@ static int max_target_number(void)
 
 	x = -1;
 	t = all_targets;
-	while ( t ){
-		if ( x < t->target_number ){
+	while (t ){
+		if (x < t->target_number ){
 			x = (t->target_number) + 1;
 		}
 		t = t->next;
@@ -263,7 +263,7 @@ static int new_target_number(void)
 	x = -1;
 	t = all_targets;
 	while (t){
-		if ( x < t->target_number ){
+		if (x < t->target_number ){
 			x = t->target_number;
 		}
 		t = t->next;
@@ -353,7 +353,7 @@ static target_t *get_target_by_num(int num)
 	target_t *target = all_targets;
 
 	while (target){
-		if ( target->target_number == num ){
+		if (target->target_number == num ){
 			return target;
 		}
 		target = target->next;
@@ -428,8 +428,8 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
 	char buf[100];
 	int retval;
 	Jim_Nvp *n;
-	n = Jim_Nvp_value2name_simple( nvp_reset_modes, reset_mode );
-	if ( n->name == NULL ){
+	n = Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode );
+	if (n->name == NULL ){
 		LOG_ERROR("invalid reset mode");
 		return ERROR_FAIL;
 	}
@@ -441,8 +441,8 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
 	int save_poll = target_continuous_poll;
 	target_continuous_poll = 0;
 
-	sprintf( buf, "ocd_process_reset %s", n->name );
-	retval = Jim_Eval( interp, buf );
+	sprintf(buf, "ocd_process_reset %s", n->name );
+	retval = Jim_Eval(interp, buf );
 
 	target_continuous_poll = save_poll;
 
@@ -823,9 +823,9 @@ int target_call_event_callbacks(target_t *target, enum target_event event)
 
 	LOG_DEBUG("target event %i (%s)",
 			  event,
-			  Jim_Nvp_value2name_simple( nvp_target_event, event )->name );
+			  Jim_Nvp_value2name_simple(nvp_target_event, event )->name );
 
-	target_handle_event( target, event );
+	target_handle_event(target, event );
 
 	while (callback)
 	{
@@ -1286,7 +1286,7 @@ int target_checksum_memory(struct target_s *target, uint32_t address, uint32_t s
 			target_buffer_set_u32(target, &buffer[i*sizeof(uint32_t)], target_data);
 		}
 
-		retval = image_calculate_checksum( buffer, size, &checksum );
+		retval = image_calculate_checksum(buffer, size, &checksum );
 		free(buffer);
 	}
 
@@ -1654,22 +1654,22 @@ int handle_target(void *priv)
 		int did_something = 0;
 		if (runSrstAsserted)
 		{
-			Jim_Eval( interp, "srst_asserted");
+			Jim_Eval(interp, "srst_asserted");
 			did_something = 1;
 		}
 		if (runSrstDeasserted)
 		{
-			Jim_Eval( interp, "srst_deasserted");
+			Jim_Eval(interp, "srst_deasserted");
 			did_something = 1;
 		}
 		if (runPowerDropout)
 		{
-			Jim_Eval( interp, "power_dropout");
+			Jim_Eval(interp, "power_dropout");
 			did_something = 1;
 		}
 		if (runPowerRestore)
 		{
-			Jim_Eval( interp, "power_restore");
+			Jim_Eval(interp, "power_restore");
 			did_something = 1;
 		}
 
@@ -1982,8 +1982,8 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch
 	if (argc == 1)
 	{
 		const Jim_Nvp *n;
-		n = Jim_Nvp_name2value_simple( nvp_reset_modes, args[0] );
-		if ( (n->name == NULL) || (n->value == RESET_UNKNOWN) ){
+		n = Jim_Nvp_name2value_simple(nvp_reset_modes, args[0] );
+		if ((n->name == NULL) || (n->value == RESET_UNKNOWN) ){
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		reset_mode = n->value;
@@ -2473,16 +2473,16 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
 		if (verify)
 		{
 			/* calculate checksum of image */
-			image_calculate_checksum( buffer, buf_cnt, &checksum );
+			image_calculate_checksum(buffer, buf_cnt, &checksum );
 
 			retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum);
-			if ( retval != ERROR_OK )
+			if (retval != ERROR_OK )
 			{
 				free(buffer);
 				break;
 			}
 
-			if ( checksum != mem_checksum )
+			if (checksum != mem_checksum )
 			{
 				/* failed crc checksum, fall back to a binary compare */
 				uint8_t *data;
@@ -3084,7 +3084,7 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
 			break;
 		default:
 			Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
-			Jim_AppendStrings( interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL );
+			Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL );
 			return JIM_ERR;
 	}
 	if (len == 0) {
@@ -3132,7 +3132,7 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
 			count = (sizeof(buffer)/width);
 		}
 
-		retval = target_read_memory( target, addr, width, count, buffer );
+		retval = target_read_memory(target, addr, width, count, buffer );
 		if (retval != ERROR_OK) {
 			/* BOO !*/
 			LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed", 
@@ -3215,7 +3215,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		return JIM_ERR;
 	}
 
-	return target_array2mem( interp,target, argc-1, argv + 1 );
+	return target_array2mem(interp,target, argc-1, argv + 1 );
 }
 
 static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)
@@ -3271,7 +3271,7 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
 			break;
 		default:
 			Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
-			Jim_AppendStrings( interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL );
+			Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL );
 			return JIM_ERR;
 	}
 	if (len == 0) {
@@ -3355,22 +3355,22 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
 	return JIM_OK;
 }
 
-void target_all_handle_event( enum target_event e )
+void target_all_handle_event(enum target_event e )
 {
 	target_t *target;
 
-	LOG_DEBUG( "**all*targets: event: %d, %s",
+	LOG_DEBUG("**all*targets: event: %d, %s",
 			   (int)e,
-			   Jim_Nvp_value2name_simple( nvp_target_event, e )->name );
+			   Jim_Nvp_value2name_simple(nvp_target_event, e )->name );
 
 	target = all_targets;
 	while (target){
-		target_handle_event( target, e );
+		target_handle_event(target, e );
 		target = target->next;
 	}
 }
 
-void target_handle_event( target_t *target, enum target_event e )
+void target_handle_event(target_t *target, enum target_event e )
 {
 	target_event_action_t *teap;
 	int done;
@@ -3378,27 +3378,27 @@ void target_handle_event( target_t *target, enum target_event e )
 	teap = target->event_action;
 
 	done = 0;
-	while ( teap ){
-		if ( teap->event == e ){
+	while (teap ){
+		if (teap->event == e ){
 			done = 1;
-			LOG_DEBUG( "target: (%d) %s (%s) event: %d (%s) action: %s\n",
+			LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s\n",
 					   target->target_number,
 					   target->cmd_name,
 					   target_get_name(target),
 					   e,
-					   Jim_Nvp_value2name_simple( nvp_target_event, e )->name,
-					   Jim_GetString( teap->body, NULL ) );
-			if (Jim_EvalObj( interp, teap->body ) != JIM_OK)
+					   Jim_Nvp_value2name_simple(nvp_target_event, e )->name,
+					   Jim_GetString(teap->body, NULL ) );
+			if (Jim_EvalObj(interp, teap->body ) != JIM_OK)
 			{
 				Jim_PrintErrorMessage(interp);
 			}
 		}
 		teap = teap->next;
 	}
-	if ( !done ){
-		LOG_DEBUG( "event: %d %s - no action",
+	if (!done ){
+		LOG_DEBUG("event: %d %s - no action",
 				   e,
-				   Jim_Nvp_value2name_simple( nvp_target_event, e )->name );
+				   Jim_Nvp_value2name_simple(nvp_target_event, e )->name );
 	}
 }
 
@@ -3428,7 +3428,7 @@ static Jim_Nvp nvp_config_opts[] = {
 	{ .name = NULL, .value = -1 }
 };
 
-static int target_configure( Jim_GetOptInfo *goi, target_t *target )
+static int target_configure(Jim_GetOptInfo *goi, target_t *target )
 {
 	Jim_Nvp *n;
 	Jim_Obj *o;
@@ -3437,64 +3437,64 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 	int e;
 
 	/* parse config or cget options ... */
-	while ( goi->argc > 0 ){
-		Jim_SetEmptyResult( goi->interp );
-		/* Jim_GetOpt_Debug( goi ); */
+	while (goi->argc > 0 ){
+		Jim_SetEmptyResult(goi->interp );
+		/* Jim_GetOpt_Debug(goi ); */
 
-		if ( target->type->target_jim_configure ){
+		if (target->type->target_jim_configure ){
 			/* target defines a configure function */
 			/* target gets first dibs on parameters */
-			e = (*(target->type->target_jim_configure))( target, goi );
-			if ( e == JIM_OK ){
+			e = (*(target->type->target_jim_configure))(target, goi );
+			if (e == JIM_OK ){
 				/* more? */
 				continue;
 			}
-			if ( e == JIM_ERR ){
+			if (e == JIM_ERR ){
 				/* An error */
 				return e;
 			}
 			/* otherwise we 'continue' below */
 		}
-		e = Jim_GetOpt_Nvp( goi, nvp_config_opts, &n );
-		if ( e != JIM_OK ){
-			Jim_GetOpt_NvpUnknown( goi, nvp_config_opts, 0 );
+		e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n );
+		if (e != JIM_OK ){
+			Jim_GetOpt_NvpUnknown(goi, nvp_config_opts, 0 );
 			return e;
 		}
-		switch ( n->value ){
+		switch (n->value ){
 		case TCFG_TYPE:
 			/* not setable */
-			if ( goi->isconfigure ){
-				Jim_SetResult_sprintf( goi->interp, "not setable: %s", n->name );
+			if (goi->isconfigure ){
+				Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name );
 				return JIM_ERR;
 			} else {
 			no_params:
-				if ( goi->argc != 0 ){
-					Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "NO PARAMS");
+				if (goi->argc != 0 ){
+					Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "NO PARAMS");
 					return JIM_ERR;
 				}
 			}
-			Jim_SetResultString( goi->interp, target_get_name(target), -1 );
+			Jim_SetResultString(goi->interp, target_get_name(target), -1 );
 			/* loop for more */
 			break;
 		case TCFG_EVENT:
-			if ( goi->argc == 0 ){
-				Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
+			if (goi->argc == 0 ){
+				Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
 				return JIM_ERR;
 			}
 
-			e = Jim_GetOpt_Nvp( goi, nvp_target_event, &n );
-			if ( e != JIM_OK ){
-				Jim_GetOpt_NvpUnknown( goi, nvp_target_event, 1 );
+			e = Jim_GetOpt_Nvp(goi, nvp_target_event, &n );
+			if (e != JIM_OK ){
+				Jim_GetOpt_NvpUnknown(goi, nvp_target_event, 1 );
 				return e;
 			}
 
-			if ( goi->isconfigure ){
-				if ( goi->argc != 1 ){
-					Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
+			if (goi->isconfigure ){
+				if (goi->argc != 1 ){
+					Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
 					return JIM_ERR;
 				}
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name?");
 					return JIM_ERR;
 				}
@@ -3505,24 +3505,24 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 
 				teap = target->event_action;
 				/* replace existing? */
-				while ( teap ){
-					if ( teap->event == (enum target_event)n->value ){
+				while (teap ){
+					if (teap->event == (enum target_event)n->value ){
 						break;
 					}
 					teap = teap->next;
 				}
 
-				if ( goi->isconfigure ){
-					if ( teap == NULL ){
+				if (goi->isconfigure ){
+					if (teap == NULL ){
 						/* create new */
-						teap = calloc( 1, sizeof(*teap) );
+						teap = calloc(1, sizeof(*teap) );
 					}
 					teap->event = n->value;
-					Jim_GetOpt_Obj( goi, &o );
-					if ( teap->body ){
-						Jim_DecrRefCount( interp, teap->body );
+					Jim_GetOpt_Obj(goi, &o );
+					if (teap->body ){
+						Jim_DecrRefCount(interp, teap->body );
 					}
-					teap->body  = Jim_DuplicateObj( goi->interp, o );
+					teap->body  = Jim_DuplicateObj(goi->interp, o );
 					/*
 					 * FIXME:
 					 *     Tcl/TK - "tk events" have a nice feature.
@@ -3533,7 +3533,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 					 *     The idea is: %N - target number
 					 *     The idea is: %E - event name.
 					 */
-					Jim_IncrRefCount( teap->body );
+					Jim_IncrRefCount(teap->body );
 
 					/* add to head of event list */
 					teap->next = target->event_action;
@@ -3541,10 +3541,10 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 					Jim_SetEmptyResult(goi->interp);
 				} else {
 					/* get */
-					if ( teap == NULL ){
-						Jim_SetEmptyResult( goi->interp );
+					if (teap == NULL ){
+						Jim_SetEmptyResult(goi->interp );
 					} else {
-						Jim_SetResult( goi->interp, Jim_DuplicateObj( goi->interp, teap->body ) );
+						Jim_SetResult(goi->interp, Jim_DuplicateObj(goi->interp, teap->body ) );
 					}
 				}
 			}
@@ -3552,67 +3552,67 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 			break;
 
 		case TCFG_WORK_AREA_VIRT:
-			if ( goi->isconfigure ){
+			if (goi->isconfigure ){
 				target_free_all_working_areas(target);
-				e = Jim_GetOpt_Wide( goi, &w );
-				if ( e != JIM_OK ){
+				e = Jim_GetOpt_Wide(goi, &w );
+				if (e != JIM_OK ){
 					return e;
 				}
 				target->working_area_virt = w;
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
-			Jim_SetResult( interp, Jim_NewIntObj( goi->interp, target->working_area_virt ) );
+			Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_virt ) );
 			/* loop for more */
 			break;
 
 		case TCFG_WORK_AREA_PHYS:
-			if ( goi->isconfigure ){
+			if (goi->isconfigure ){
 				target_free_all_working_areas(target);
-				e = Jim_GetOpt_Wide( goi, &w );
-				if ( e != JIM_OK ){
+				e = Jim_GetOpt_Wide(goi, &w );
+				if (e != JIM_OK ){
 					return e;
 				}
 				target->working_area_phys = w;
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
-			Jim_SetResult( interp, Jim_NewIntObj( goi->interp, target->working_area_phys ) );
+			Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_phys ) );
 			/* loop for more */
 			break;
 
 		case TCFG_WORK_AREA_SIZE:
-			if ( goi->isconfigure ){
+			if (goi->isconfigure ){
 				target_free_all_working_areas(target);
-				e = Jim_GetOpt_Wide( goi, &w );
-				if ( e != JIM_OK ){
+				e = Jim_GetOpt_Wide(goi, &w );
+				if (e != JIM_OK ){
 					return e;
 				}
 				target->working_area_size = w;
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
-			Jim_SetResult( interp, Jim_NewIntObj( goi->interp, target->working_area_size ) );
+			Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_size ) );
 			/* loop for more */
 			break;
 
 		case TCFG_WORK_AREA_BACKUP:
-			if ( goi->isconfigure ){
+			if (goi->isconfigure ){
 				target_free_all_working_areas(target);
-				e = Jim_GetOpt_Wide( goi, &w );
-				if ( e != JIM_OK ){
+				e = Jim_GetOpt_Wide(goi, &w );
+				if (e != JIM_OK ){
 					return e;
 				}
 				/* make this exactly 1 or 0 */
 				target->backup_working_area = (!!w);
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
@@ -3621,73 +3621,73 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 			break;
 
 		case TCFG_ENDIAN:
-			if ( goi->isconfigure ){
-				e = Jim_GetOpt_Nvp( goi, nvp_target_endian, &n );
-				if ( e != JIM_OK ){
-					Jim_GetOpt_NvpUnknown( goi, nvp_target_endian, 1 );
+			if (goi->isconfigure ){
+				e = Jim_GetOpt_Nvp(goi, nvp_target_endian, &n );
+				if (e != JIM_OK ){
+					Jim_GetOpt_NvpUnknown(goi, nvp_target_endian, 1 );
 					return e;
 				}
 				target->endianness = n->value;
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
-			n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
-			if ( n->name == NULL ){
+			n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness );
+			if (n->name == NULL ){
 				target->endianness = TARGET_LITTLE_ENDIAN;
-				n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
+				n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness );
 			}
-			Jim_SetResultString( goi->interp, n->name, -1 );
+			Jim_SetResultString(goi->interp, n->name, -1 );
 			/* loop for more */
 			break;
 
 		case TCFG_VARIANT:
-			if ( goi->isconfigure ){
-				if ( goi->argc < 1 ){
-					Jim_SetResult_sprintf( goi->interp,
+			if (goi->isconfigure ){
+				if (goi->argc < 1 ){
+					Jim_SetResult_sprintf(goi->interp,
 										   "%s ?STRING?",
 										   n->name );
 					return JIM_ERR;
 				}
-				if ( target->variant ){
+				if (target->variant ){
 					free((void *)(target->variant));
 				}
-				e = Jim_GetOpt_String( goi, &cp, NULL );
+				e = Jim_GetOpt_String(goi, &cp, NULL );
 				target->variant = strdup(cp);
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
-			Jim_SetResultString( goi->interp, target->variant,-1 );
+			Jim_SetResultString(goi->interp, target->variant,-1 );
 			/* loop for more */
 			break;
 		case TCFG_CHAIN_POSITION:
-			if ( goi->isconfigure ){
+			if (goi->isconfigure ){
 				Jim_Obj *o;
 				jtag_tap_t *tap;
 				target_free_all_working_areas(target);
-				e = Jim_GetOpt_Obj( goi, &o );
-				if ( e != JIM_OK ){
+				e = Jim_GetOpt_Obj(goi, &o );
+				if (e != JIM_OK ){
 					return e;
 				}
-				tap = jtag_tap_by_jim_obj( goi->interp, o );
-				if ( tap == NULL ){
+				tap = jtag_tap_by_jim_obj(goi->interp, o );
+				if (tap == NULL ){
 					return JIM_ERR;
 				}
 				/* make this exactly 1 or 0 */
 				target->tap = tap;
 			} else {
-				if ( goi->argc != 0 ){
+				if (goi->argc != 0 ){
 					goto no_params;
 				}
 			}
-			Jim_SetResultString( interp, target->tap->dotted_name, -1 );
+			Jim_SetResultString(interp, target->tap->dotted_name, -1 );
 			/* loop for more e*/
 			break;
 		}
-	} /* while ( goi->argc ) */
+	} /* while (goi->argc ) */
 
 
 		/* done - we return */
@@ -3695,7 +3695,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 }
 
 /** this is the 'tcl' handler for the target specific command */
-static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 {
 	Jim_GetOptInfo goi;
 	jim_wide a,b,c;
@@ -3749,36 +3749,36 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 	};
 
 	/* go past the "command" */
-	Jim_GetOpt_Setup( &goi, interp, argc-1, argv + 1 );
+	Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1 );
 
-	target = Jim_CmdPrivData( goi.interp );
+	target = Jim_CmdPrivData(goi.interp );
 	cmd_ctx = Jim_GetAssocData(goi.interp, "context");
 
 	/* commands here are in an NVP table */
-	e = Jim_GetOpt_Nvp( &goi, target_options, &n );
-	if ( e != JIM_OK ){
-		Jim_GetOpt_NvpUnknown( &goi, target_options, 0 );
+	e = Jim_GetOpt_Nvp(&goi, target_options, &n );
+	if (e != JIM_OK ){
+		Jim_GetOpt_NvpUnknown(&goi, target_options, 0 );
 		return e;
 	}
 	/* Assume blank result */
-	Jim_SetEmptyResult( goi.interp );
+	Jim_SetEmptyResult(goi.interp );
 
-	switch ( n->value ){
+	switch (n->value ){
 	case TS_CMD_CONFIGURE:
-		if ( goi.argc < 2 ){
-			Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
+		if (goi.argc < 2 ){
+			Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
 			return JIM_ERR;
 		}
 		goi.isconfigure = 1;
-		return target_configure( &goi, target );
+		return target_configure(&goi, target );
 	case TS_CMD_CGET:
 		// some things take params
-		if ( goi.argc < 1 ){
-			Jim_WrongNumArgs( goi.interp, 0, goi.argv, "missing: ?-option?");
+		if (goi.argc < 1 ){
+			Jim_WrongNumArgs(goi.interp, 0, goi.argv, "missing: ?-option?");
 			return JIM_ERR;
 		}
 		goi.isconfigure = 0;
-		return target_configure( &goi, target );
+		return target_configure(&goi, target );
 		break;
 	case TS_CMD_MWW:
 	case TS_CMD_MWH:
@@ -3789,50 +3789,50 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 		 * argv[3] = optional count.
 		 */
 
-		if ( (goi.argc == 2) || (goi.argc == 3) ){
+		if ((goi.argc == 2) || (goi.argc == 3) ){
 			/* all is well */
 		} else {
 		mwx_error:
-			Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR DATA [COUNT]", n->name );
+			Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR DATA [COUNT]", n->name );
 			return JIM_ERR;
 		}
 
-		e = Jim_GetOpt_Wide( &goi, &a );
-		if ( e != JIM_OK ){
+		e = Jim_GetOpt_Wide(&goi, &a );
+		if (e != JIM_OK ){
 			goto mwx_error;
 		}
 
-		e = Jim_GetOpt_Wide( &goi, &b );
-		if ( e != JIM_OK ){
+		e = Jim_GetOpt_Wide(&goi, &b );
+		if (e != JIM_OK ){
 			goto mwx_error;
 		}
 		if (goi.argc == 3) {
-			e = Jim_GetOpt_Wide( &goi, &c );
-			if ( e != JIM_OK ){
+			e = Jim_GetOpt_Wide(&goi, &c );
+			if (e != JIM_OK ){
 				goto mwx_error;
 			}
 		} else {
 			c = 1;
 		}
 
-		switch ( n->value ){
+		switch (n->value ){
 		case TS_CMD_MWW:
-			target_buffer_set_u32( target, target_buf, b );
+			target_buffer_set_u32(target, target_buf, b );
 			b = 4;
 			break;
 		case TS_CMD_MWH:
-			target_buffer_set_u16( target, target_buf, b );
+			target_buffer_set_u16(target, target_buf, b );
 			b = 2;
 			break;
 		case TS_CMD_MWB:
-			target_buffer_set_u8( target, target_buf, b );
+			target_buffer_set_u8(target, target_buf, b );
 			b = 1;
 			break;
 		}
-		for ( x = 0 ; x < c ; x++ ){
-			e = target_write_memory( target, a, b, 1, target_buf );
-			if ( e != ERROR_OK ){
-				Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
+		for (x = 0 ; x < c ; x++ ){
+			e = target_write_memory(target, a, b, 1, target_buf );
+			if (e != ERROR_OK ){
+				Jim_SetResult_sprintf(interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
 				return JIM_ERR;
 			}
 			/* b = width */
@@ -3849,24 +3849,24 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 		 * argv[1] = address
 		 * argv[2] = optional count
 		 */
-		if ( (goi.argc == 2) || (goi.argc == 3) ){
-			Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR [COUNT]", n->name );
+		if ((goi.argc == 2) || (goi.argc == 3) ){
+			Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR [COUNT]", n->name );
 			return JIM_ERR;
 		}
-		e = Jim_GetOpt_Wide( &goi, &a );
-		if ( e != JIM_OK ){
+		e = Jim_GetOpt_Wide(&goi, &a );
+		if (e != JIM_OK ){
 			return JIM_ERR;
 		}
-		if ( goi.argc ){
-			e = Jim_GetOpt_Wide( &goi, &c );
-			if ( e != JIM_OK ){
+		if (goi.argc ){
+			e = Jim_GetOpt_Wide(&goi, &c );
+			if (e != JIM_OK ){
 				return JIM_ERR;
 			}
 		} else {
 			c = 1;
 		}
 		b = 1; /* shut up gcc */
-		switch ( n->value ){
+		switch (n->value ){
 		case TS_CMD_MDW:
 			b =  4;
 			break;
@@ -3881,51 +3881,51 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 		/* convert to "bytes" */
 		c = c * b;
 		/* count is now in 'BYTES' */
-		while ( c > 0 ){
+		while (c > 0 ){
 			y = c;
-			if ( y > 16 ){
+			if (y > 16 ){
 				y = 16;
 			}
-			e = target_read_memory( target, a, b, y / b, target_buf );
-			if ( e != ERROR_OK ){
-				Jim_SetResult_sprintf( interp, "error reading target @ 0x%08lx", (int)(a) );
+			e = target_read_memory(target, a, b, y / b, target_buf );
+			if (e != ERROR_OK ){
+				Jim_SetResult_sprintf(interp, "error reading target @ 0x%08lx", (int)(a) );
 				return JIM_ERR;
 			}
 
-			Jim_fprintf( interp, interp->cookie_stdout, "0x%08x ", (int)(a) );
-			switch ( b ){
+			Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a) );
+			switch (b ){
 			case 4:
-				for ( x = 0 ; (x < 16) && (x < y) ; x += 4 ){
-					z = target_buffer_get_u32( target, &(target_buf[ x * 4 ]) );
-					Jim_fprintf( interp, interp->cookie_stdout, "%08x ", (int)(z) );
+				for (x = 0 ; (x < 16) && (x < y) ; x += 4 ){
+					z = target_buffer_get_u32(target, &(target_buf[ x * 4 ]) );
+					Jim_fprintf(interp, interp->cookie_stdout, "%08x ", (int)(z) );
 				}
-				for ( ; (x < 16) ; x += 4 ){
-					Jim_fprintf( interp, interp->cookie_stdout, "         " );
+				for (; (x < 16) ; x += 4 ){
+					Jim_fprintf(interp, interp->cookie_stdout, "         " );
 				}
 				break;
 			case 2:
-				for ( x = 0 ; (x < 16) && (x < y) ; x += 2 ){
-					z = target_buffer_get_u16( target, &(target_buf[ x * 2 ]) );
-					Jim_fprintf( interp, interp->cookie_stdout, "%04x ", (int)(z) );
+				for (x = 0 ; (x < 16) && (x < y) ; x += 2 ){
+					z = target_buffer_get_u16(target, &(target_buf[ x * 2 ]) );
+					Jim_fprintf(interp, interp->cookie_stdout, "%04x ", (int)(z) );
 				}
-				for ( ; (x < 16) ; x += 2 ){
-					Jim_fprintf( interp, interp->cookie_stdout, "     " );
+				for (; (x < 16) ; x += 2 ){
+					Jim_fprintf(interp, interp->cookie_stdout, "     " );
 				}
 				break;
 			case 1:
 			default:
-				for ( x = 0 ; (x < 16) && (x < y) ; x += 1 ){
-					z = target_buffer_get_u8( target, &(target_buf[ x * 4 ]) );
-					Jim_fprintf( interp, interp->cookie_stdout, "%02x ", (int)(z) );
+				for (x = 0 ; (x < 16) && (x < y) ; x += 1 ){
+					z = target_buffer_get_u8(target, &(target_buf[ x * 4 ]) );
+					Jim_fprintf(interp, interp->cookie_stdout, "%02x ", (int)(z) );
 				}
-				for ( ; (x < 16) ; x += 1 ){
-					Jim_fprintf( interp, interp->cookie_stdout, "   " );
+				for (; (x < 16) ; x += 1 ){
+					Jim_fprintf(interp, interp->cookie_stdout, "   " );
 				}
 				break;
 			}
 			/* ascii-ify the bytes */
-			for ( x = 0 ; x < y ; x++ ){
-				if ( (target_buf[x] >= 0x20) &&
+			for (x = 0 ; x < y ; x++ ){
+				if ((target_buf[x] >= 0x20) &&
 					(target_buf[x] <= 0x7e) ){
 					/* good */
 				} else {
@@ -3934,70 +3934,70 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 				}
 			}
 			/* space pad  */
-			while ( x < 16 ){
+			while (x < 16 ){
 				target_buf[x] = ' ';
 				x++;
 			}
 			/* terminate */
 			target_buf[16] = 0;
 			/* print - with a newline */
-			Jim_fprintf( interp, interp->cookie_stdout, "%s\n", target_buf );
+			Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf );
 			/* NEXT... */
 			c -= 16;
 			a += 16;
 		}
 		return JIM_OK;
 	case TS_CMD_MEM2ARRAY:
-		return target_mem2array( goi.interp, target, goi.argc, goi.argv );
+		return target_mem2array(goi.interp, target, goi.argc, goi.argv );
 		break;
 	case TS_CMD_ARRAY2MEM:
-		return target_array2mem( goi.interp, target, goi.argc, goi.argv );
+		return target_array2mem(goi.interp, target, goi.argc, goi.argv );
 		break;
 	case TS_CMD_EXAMINE:
-		if ( goi.argc ){
-			Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]");
+		if (goi.argc ){
+			Jim_WrongNumArgs(goi.interp, 2, argv, "[no parameters]");
 			return JIM_ERR;
 		}
 		if (!target->tap->enabled)
 			goto err_tap_disabled;
-		e = target->type->examine( target );
-		if ( e != ERROR_OK ){
-			Jim_SetResult_sprintf( interp, "examine-fails: %d", e );
+		e = target->type->examine(target );
+		if (e != ERROR_OK ){
+			Jim_SetResult_sprintf(interp, "examine-fails: %d", e );
 			return JIM_ERR;
 		}
 		return JIM_OK;
 	case TS_CMD_POLL:
-		if ( goi.argc ){
-			Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]");
+		if (goi.argc ){
+			Jim_WrongNumArgs(goi.interp, 2, argv, "[no parameters]");
 			return JIM_ERR;
 		}
 		if (!target->tap->enabled)
 			goto err_tap_disabled;
-		if ( !(target_was_examined(target)) ){
+		if (!(target_was_examined(target)) ){
 			e = ERROR_TARGET_NOT_EXAMINED;
 		} else {
-			e = target->type->poll( target );
+			e = target->type->poll(target );
 		}
-		if ( e != ERROR_OK ){
-			Jim_SetResult_sprintf( interp, "poll-fails: %d", e );
+		if (e != ERROR_OK ){
+			Jim_SetResult_sprintf(interp, "poll-fails: %d", e );
 			return JIM_ERR;
 		} else {
 			return JIM_OK;
 		}
 		break;
 	case TS_CMD_RESET:
-		if ( goi.argc != 2 ){
-			Jim_WrongNumArgs( interp, 2, argv, "t | f|assert | deassert BOOL");
+		if (goi.argc != 2 ){
+			Jim_WrongNumArgs(interp, 2, argv, "t | f|assert | deassert BOOL");
 			return JIM_ERR;
 		}
-		e = Jim_GetOpt_Nvp( &goi, nvp_assert, &n );
-		if ( e != JIM_OK ){
-			Jim_GetOpt_NvpUnknown( &goi, nvp_assert, 1 );
+		e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n );
+		if (e != JIM_OK ){
+			Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1 );
 			return e;
 		}
 		/* the halt or not param */
-		e = Jim_GetOpt_Wide( &goi, &a);
-		if ( e != JIM_OK ){
+		e = Jim_GetOpt_Wide(&goi, &a);
+		if (e != JIM_OK ){
 			return e;
 		}
 		if (!target->tap->enabled)
@@ -4008,41 +4008,41 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 		target_free_all_working_areas_restore(target, 0);
 
 		/* do the assert */
-		if ( n->value == NVP_ASSERT ){
-			target->type->assert_reset( target );
+		if (n->value == NVP_ASSERT ){
+			target->type->assert_reset(target );
 		} else {
-			target->type->deassert_reset( target );
+			target->type->deassert_reset(target );
 		}
 		return JIM_OK;
 	case TS_CMD_HALT:
-		if ( goi.argc ){
-			Jim_WrongNumArgs( goi.interp, 0, argv, "halt [no parameters]");
+		if (goi.argc ){
+			Jim_WrongNumArgs(goi.interp, 0, argv, "halt [no parameters]");
 			return JIM_ERR;
 		}
 		if (!target->tap->enabled)
 			goto err_tap_disabled;
-		target->type->halt( target );
+		target->type->halt(target );
 		return JIM_OK;
 	case TS_CMD_WAITSTATE:
 		/* params:  <name>  statename timeoutmsecs */
-		if ( goi.argc != 2 ){
-			Jim_SetResult_sprintf( goi.interp, "%s STATENAME TIMEOUTMSECS", n->name );
+		if (goi.argc != 2 ){
+			Jim_SetResult_sprintf(goi.interp, "%s STATENAME TIMEOUTMSECS", n->name );
 			return JIM_ERR;
 		}
-		e = Jim_GetOpt_Nvp( &goi, nvp_target_state, &n );
-		if ( e != JIM_OK ){
-			Jim_GetOpt_NvpUnknown( &goi, nvp_target_state,1 );
+		e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n );
+		if (e != JIM_OK ){
+			Jim_GetOpt_NvpUnknown(&goi, nvp_target_state,1 );
 			return e;
 		}
-		e = Jim_GetOpt_Wide( &goi, &a );
-		if ( e != JIM_OK ){
+		e = Jim_GetOpt_Wide(&goi, &a );
+		if (e != JIM_OK ){
 			return e;
 		}
 		if (!target->tap->enabled)
 			goto err_tap_disabled;
-		e = target_wait_state( target, n->value, a );
-		if ( e != ERROR_OK ){
-			Jim_SetResult_sprintf( goi.interp,
+		e = target_wait_state(target, n->value, a );
+		if (e != ERROR_OK ){
+			Jim_SetResult_sprintf(goi.interp,
 								   "target: %s wait %s fails (%d) %s",
 								   target->cmd_name,
 								   n->name,
@@ -4058,40 +4058,40 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 		{
 			target_event_action_t *teap;
 			teap = target->event_action;
-			command_print( cmd_ctx, "Event actions for target (%d) %s\n",
+			command_print(cmd_ctx, "Event actions for target (%d) %s\n",
 						   target->target_number,
 						   target->cmd_name );
-			command_print( cmd_ctx, "%-25s | Body", "Event");
-			command_print( cmd_ctx, "------------------------- | ----------------------------------------");
-			while ( teap ){
-				command_print( cmd_ctx,
+			command_print(cmd_ctx, "%-25s | Body", "Event");
+			command_print(cmd_ctx, "------------------------- | ----------------------------------------");
+			while (teap ){
+				command_print(cmd_ctx,
 							   "%-25s | %s",
-							   Jim_Nvp_value2name_simple( nvp_target_event, teap->event )->name,
-							   Jim_GetString( teap->body, NULL ) );
+							   Jim_Nvp_value2name_simple(nvp_target_event, teap->event )->name,
+							   Jim_GetString(teap->body, NULL ) );
 				teap = teap->next;
 			}
-			command_print( cmd_ctx, "***END***");
+			command_print(cmd_ctx, "***END***");
 			return JIM_OK;
 		}
 	case TS_CMD_CURSTATE:
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 0, argv, "[no parameters]");
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 0, argv, "[no parameters]");
 			return JIM_ERR;
 		}
-		Jim_SetResultString( goi.interp,
+		Jim_SetResultString(goi.interp,
 							 Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
 		return JIM_OK;
 	case TS_CMD_INVOKE_EVENT:
-		if ( goi.argc != 1 ){
-			Jim_SetResult_sprintf( goi.interp, "%s ?EVENTNAME?",n->name);
+		if (goi.argc != 1 ){
+			Jim_SetResult_sprintf(goi.interp, "%s ?EVENTNAME?",n->name);
 			return JIM_ERR;
 		}
-		e = Jim_GetOpt_Nvp( &goi, nvp_target_event, &n );
-		if ( e != JIM_OK ){
-			Jim_GetOpt_NvpUnknown( &goi, nvp_target_event, 1 );
+		e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n );
+		if (e != JIM_OK ){
+			Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1 );
 			return e;
 		}
-		target_handle_event( target, n->value );
+		target_handle_event(target, n->value );
 		return JIM_OK;
 	}
 	return JIM_ERR;
@@ -4101,7 +4101,7 @@ err_tap_disabled:
 	return JIM_ERR;
 }
 
-static int target_create( Jim_GetOptInfo *goi )
+static int target_create(Jim_GetOptInfo *goi )
 {
 	Jim_Obj *new_cmd;
 	Jim_Cmd *cmd;
@@ -4113,41 +4113,41 @@ static int target_create( Jim_GetOptInfo *goi )
 	struct command_context_s *cmd_ctx;
 
 	cmd_ctx = Jim_GetAssocData(goi->interp, "context");
-	if ( goi->argc < 3 ){
-		Jim_WrongNumArgs( goi->interp, 1, goi->argv, "?name? ?type? ..options...");
+	if (goi->argc < 3 ){
+		Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ?type? ..options...");
 		return JIM_ERR;
 	}
 
 	/* COMMAND */
-	Jim_GetOpt_Obj( goi, &new_cmd );
+	Jim_GetOpt_Obj(goi, &new_cmd );
 	/* does this command exist? */
-	cmd = Jim_GetCommand( goi->interp, new_cmd, JIM_ERRMSG );
-	if ( cmd ){
-		cp = Jim_GetString( new_cmd, NULL );
+	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG );
+	if (cmd ){
+		cp = Jim_GetString(new_cmd, NULL );
 		Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
 		return JIM_ERR;
 	}
 
 	/* TYPE */
-	e = Jim_GetOpt_String( goi, &cp2, NULL );
+	e = Jim_GetOpt_String(goi, &cp2, NULL );
 	cp = cp2;
 	/* now does target type exist */
-	for ( x = 0 ; target_types[x] ; x++ ){
-		if ( 0 == strcmp( cp, target_types[x]->name ) ){
+	for (x = 0 ; target_types[x] ; x++ ){
+		if (0 == strcmp(cp, target_types[x]->name ) ){
 			/* found */
 			break;
 		}
 	}
-	if ( target_types[x] == NULL ){
-		Jim_SetResult_sprintf( goi->interp, "Unknown target type %s, try one of ", cp );
-		for ( x = 0 ; target_types[x] ; x++ ){
-			if ( target_types[x + 1] ){
-				Jim_AppendStrings( goi->interp,
+	if (target_types[x] == NULL ){
+		Jim_SetResult_sprintf(goi->interp, "Unknown target type %s, try one of ", cp );
+		for (x = 0 ; target_types[x] ; x++ ){
+			if (target_types[x + 1] ){
+				Jim_AppendStrings(goi->interp,
 								   Jim_GetResult(goi->interp),
 								   target_types[x]->name,
 								   ", ", NULL);
 			} else {
-				Jim_AppendStrings( goi->interp,
+				Jim_AppendStrings(goi->interp,
 								   Jim_GetResult(goi->interp),
 								   " or ",
 								   target_types[x]->name,NULL );
@@ -4164,7 +4164,7 @@ static int target_create( Jim_GetOptInfo *goi )
 	/* allocate memory for each unique target type */
 	target->type = (target_type_t*)calloc(1,sizeof(target_type_t));
 
-	memcpy( target->type, target_types[x], sizeof(target_type_t));
+	memcpy(target->type, target_types[x], sizeof(target_type_t));
 
 	/* will be set by "-endian" */
 	target->endianness = TARGET_ENDIAN_UNKNOWN;
@@ -4201,21 +4201,21 @@ static int target_create( Jim_GetOptInfo *goi )
 
 	/* Do the rest as "configure" options */
 	goi->isconfigure = 1;
-	e = target_configure( goi, target);
+	e = target_configure(goi, target);
 
 	if (target->tap == NULL)
 	{
-		Jim_SetResultString( interp, "-chain-position required when creating target", -1);
+		Jim_SetResultString(interp, "-chain-position required when creating target", -1);
 		e = JIM_ERR;
 	}
 
-	if ( e != JIM_OK ){
-		free( target->type );
-		free( target );
+	if (e != JIM_OK ){
+		free(target->type );
+		free(target );
 		return e;
 	}
 
-	if ( target->endianness == TARGET_ENDIAN_UNKNOWN ){
+	if (target->endianness == TARGET_ENDIAN_UNKNOWN ){
 		/* default endian to little if not specified */
 		target->endianness = TARGET_LITTLE_ENDIAN;
 	}
@@ -4225,28 +4225,28 @@ static int target_create( Jim_GetOptInfo *goi )
 		target->variant = strdup("");
 
 	/* create the target specific commands */
-	if ( target->type->register_commands ){
-		(*(target->type->register_commands))( cmd_ctx );
+	if (target->type->register_commands ){
+		(*(target->type->register_commands))(cmd_ctx );
 	}
-	if ( target->type->target_create ){
-		(*(target->type->target_create))( target, goi->interp );
+	if (target->type->target_create ){
+		(*(target->type->target_create))(target, goi->interp );
 	}
 
 	/* append to end of list */
 	{
 		target_t **tpp;
 		tpp = &(all_targets);
-		while ( *tpp ){
-			tpp = &( (*tpp)->next );
+		while (*tpp ){
+			tpp = &((*tpp)->next );
 		}
 		*tpp = target;
 	}
 
-	cp = Jim_GetString( new_cmd, NULL );
+	cp = Jim_GetString(new_cmd, NULL );
 	target->cmd_name = strdup(cp);
 
 	/* now - create the new target name command */
-	e = Jim_CreateCommand( goi->interp,
+	e = Jim_CreateCommand(goi->interp,
 						   /* name */
 						   cp,
 						   tcl_target_func, /* C function */
@@ -4256,7 +4256,7 @@ static int target_create( Jim_GetOptInfo *goi )
 	return e;
 }
 
-static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 {
 	int x,r,e;
 	jim_wide w;
@@ -4281,18 +4281,18 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 	LOG_DEBUG("Target command params:");
 	LOG_DEBUG("%s", Jim_Debug_ArgvString(interp, argc, argv));
 
-	cmd_ctx = Jim_GetAssocData( interp, "context" );
+	cmd_ctx = Jim_GetAssocData(interp, "context" );
 
-	Jim_GetOpt_Setup( &goi, interp, argc-1, argv + 1 );
+	Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1 );
 
-	if ( goi.argc == 0 ){
+	if (goi.argc == 0 ){
 		Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
 		return JIM_ERR;
 	}
 
-	/* Jim_GetOpt_Debug( &goi ); */
-	r = Jim_GetOpt_Enum( &goi, target_cmds, &x   );
-	if ( r != JIM_OK ){
+	/* Jim_GetOpt_Debug(&goi ); */
+	r = Jim_GetOpt_Enum(&goi, target_cmds, &x   );
+	if (r != JIM_OK ){
 		return r;
 	}
 
@@ -4301,71 +4301,71 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 		Jim_Panic(goi.interp,"Why am I here?");
 		return JIM_ERR;
 	case TG_CMD_CURRENT:
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters");
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
 			return JIM_ERR;
 		}
-		Jim_SetResultString( goi.interp, get_current_target( cmd_ctx )->cmd_name, -1 );
+		Jim_SetResultString(goi.interp, get_current_target(cmd_ctx )->cmd_name, -1 );
 		return JIM_OK;
 	case TG_CMD_TYPES:
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters" );
 			return JIM_ERR;
 		}
-		Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );
-		for ( x = 0 ; target_types[x] ; x++ ){
-			Jim_ListAppendElement( goi.interp,
+		Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0 ) );
+		for (x = 0 ; target_types[x] ; x++ ){
+			Jim_ListAppendElement(goi.interp,
 								   Jim_GetResult(goi.interp),
-								   Jim_NewStringObj( goi.interp, target_types[x]->name, -1 ) );
+								   Jim_NewStringObj(goi.interp, target_types[x]->name, -1 ) );
 		}
 		return JIM_OK;
 	case TG_CMD_NAMES:
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters" );
 			return JIM_ERR;
 		}
-		Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );
+		Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0 ) );
 		target = all_targets;
-		while ( target ){
-			Jim_ListAppendElement( goi.interp,
+		while (target ){
+			Jim_ListAppendElement(goi.interp,
 								   Jim_GetResult(goi.interp),
-								   Jim_NewStringObj( goi.interp, target->cmd_name, -1 ) );
+								   Jim_NewStringObj(goi.interp, target->cmd_name, -1 ) );
 			target = target->next;
 		}
 		return JIM_OK;
 	case TG_CMD_CREATE:
-		if ( goi.argc < 3 ){
-			Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "?name  ... config options ...");
+		if (goi.argc < 3 ){
+			Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "?name  ... config options ...");
 			return JIM_ERR;
 		}
-		return target_create( &goi );
+		return target_create(&goi );
 		break;
 	case TG_CMD_NUMBER:
-		if ( goi.argc != 1 ){
-			Jim_SetResult_sprintf( goi.interp, "expected: target number ?NUMBER?");
+		if (goi.argc != 1 ){
+			Jim_SetResult_sprintf(goi.interp, "expected: target number ?NUMBER?");
 			return JIM_ERR;
 		}
-		e = Jim_GetOpt_Wide( &goi, &w );
-		if ( e != JIM_OK ){
+		e = Jim_GetOpt_Wide(&goi, &w );
+		if (e != JIM_OK ){
 			return JIM_ERR;
 		}
 		{
 			target_t *t;
 			t = get_target_by_num(w);
-			if ( t == NULL ){
-				Jim_SetResult_sprintf( goi.interp,"Target: number %d does not exist", (int)(w));
+			if (t == NULL ){
+				Jim_SetResult_sprintf(goi.interp,"Target: number %d does not exist", (int)(w));
 				return JIM_ERR;
 			}
-			Jim_SetResultString( goi.interp, t->cmd_name, -1 );
+			Jim_SetResultString(goi.interp, t->cmd_name, -1 );
 			return JIM_OK;
 		}
 	case TG_CMD_COUNT:
-		if ( goi.argc != 0 ){
-			Jim_WrongNumArgs( goi.interp, 0, goi.argv, "<no parameters>");
+		if (goi.argc != 0 ){
+			Jim_WrongNumArgs(goi.interp, 0, goi.argv, "<no parameters>");
 			return JIM_ERR;
 		}
-		Jim_SetResult( goi.interp,
-					   Jim_NewIntObj( goi.interp, max_target_number()));
+		Jim_SetResult(goi.interp,
+					   Jim_NewIntObj(goi.interp, max_target_number()));
 		return JIM_OK;
 	}
 
diff --git a/src/target/target.h b/src/target/target.h
index f7744460..687ff0ae 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -396,8 +396,8 @@ int target_write_u8(struct target_s *target, uint32_t address, uint8_t value);
 /* Issues USER() statements with target state information */
 int target_arch_state(struct target_s *target);
 
-void target_handle_event( target_t *t, enum target_event e);
-void target_all_handle_event( enum target_event e );
+void target_handle_event(target_t *t, enum target_event e);
+void target_all_handle_event(enum target_event e );
 
 #define ERROR_TARGET_INVALID	(-300)
 #define ERROR_TARGET_INIT_FAILED (-301)
@@ -412,6 +412,6 @@ void target_all_handle_event( enum target_event e );
 #define ERROR_TARGET_NOT_EXAMINED (-311)
 
 extern const Jim_Nvp nvp_error_target[];
-extern const char *target_strerror_safe( int err );
+extern const char *target_strerror_safe(int err );
 
 #endif /* TARGET_H */
diff --git a/src/target/target_request.c b/src/target/target_request.c
index 54d8df68..af59a6df 100644
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -117,7 +117,7 @@ int target_request(target_t *target, uint32_t request)
 {
 	target_req_cmd_t target_req_cmd = request & 0xff;
 
-	if ( charmsg_mode ) {
+	if (charmsg_mode ) {
 		target_charmsg(target, target_req_cmd );
 		return ERROR_OK;
 	}
diff --git a/src/target/target_type.h b/src/target/target_type.h
index dd69d8c2..5ef6741d 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -129,16 +129,16 @@ struct target_type_s
 	int (*register_commands)(struct command_context_s *cmd_ctx);
 
 	/* called when target is created */
-	int (*target_create)( struct target_s *target, Jim_Interp *interp );
+	int (*target_create)(struct target_s *target, Jim_Interp *interp );
 
 	/* called for various config parameters */
 	/* returns JIM_CONTINUE - if option not understood */
 	/* otherwise: JIM_OK, or JIM_ERR, */
-	int (*target_jim_configure)( struct target_s *target, Jim_GetOptInfo *goi );
+	int (*target_jim_configure)(struct target_s *target, Jim_GetOptInfo *goi );
 
 	/* target commands specifically handled by the target */
 	/* returns JIM_OK, or JIM_ERR, or JIM_CONTINUE - if option not understood */
-	int (*target_jim_commands)( struct target_s *target, Jim_GetOptInfo *goi );
+	int (*target_jim_commands)(struct target_s *target, Jim_GetOptInfo *goi );
 
 	/* invoked after JTAG chain has been examined & validated. During
 	 * this stage the target is examined and any additional setup is
diff --git a/src/target/trace.c b/src/target/trace.c
index 17f899fb..7c1519cf 100644
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -123,7 +123,7 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 		uint32_t first = 0;
 		uint32_t last = trace->trace_history_pos;
 
-		if ( !trace->trace_history_size ) {
+		if (!trace->trace_history_size ) {
 			command_print(cmd_ctx, "trace history buffer is not allocated");
 			return ERROR_OK;
 		}
diff --git a/src/target/xscale.c b/src/target/xscale.c
index e87f5527..d0180b97 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -959,7 +959,7 @@ int xscale_arch_state(struct target_s *target)
 			"MMU: %s, D-Cache: %s, I-Cache: %s"
 			"%s",
 			 armv4_5_state_strings[armv4_5->core_state],
-			 Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name ,
+			 Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name ,
 			 armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
 			 buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
 			 buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
@@ -1202,7 +1202,7 @@ int xscale_halt(target_t *target)
 	xscale_common_t *xscale = armv4_5->arch_info;
 
 	LOG_DEBUG("target->state: %s",
-		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		  Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	if (target->state == TARGET_HALTED)
 	{
@@ -1568,7 +1568,7 @@ int xscale_assert_reset(target_t *target)
 	xscale_common_t *xscale = armv4_5->arch_info;
 
 	LOG_DEBUG("target->state: %s",
-		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+		  Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
 
 	/* select DCSR instruction (set endstate to R-T-I to ensure we don't
 	 * end up in T-L-R, which would reset JTAG