X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fcore.c;h=34ad11b075d1171253979585169dd630b6e4649d;hp=6ebddfc78f4ca44d9228845acb98093b6f353cea;hb=3813fda44adcea486b7308423a699f63d79273ee;hpb=95d2a2372421aeddae01f1af51279ab7989e46b5

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 6ebddfc78f..34ad11b075 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -302,7 +302,7 @@ static void jtag_prelude(tap_state_t state)
 {
 	jtag_checks();
 
-	assert(state!=TAP_INVALID);
+	assert(state != TAP_INVALID);
 
 	cmd_queue_cur_state = state;
 }
@@ -324,7 +324,7 @@ void jtag_add_ir_scan_noverify(int in_count, const scan_field_t *in_fields,
 
 void jtag_add_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
 {
-	if (jtag_verify&&jtag_verify_capture_ir)
+	if (jtag_verify && jtag_verify_capture_ir)
 	{
 		/* 8 x 32 bit id's is enough for all invocations */
 
@@ -508,9 +508,9 @@ int jtag_add_statemove(tap_state_t goal_state)
 		tap_state_name(goal_state) );
 
 
-	if (goal_state==cur_state )
+	if (goal_state == cur_state )
 		;	/* nothing to do */
-	else if ( goal_state==TAP_RESET )
+	else if ( goal_state == TAP_RESET )
 	{
 		jtag_add_tlr();
 	}
@@ -576,12 +576,12 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
 	 */
 	if ((jtag_reset_config & RESET_HAS_SRST)&&
 			(jtag_reset_config & RESET_HAS_TRST)&&
-			((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
+			((jtag_reset_config & RESET_SRST_PULLS_TRST) == 0))
 	{
 		if (((req_tlr_or_trst&&!jtag_trst)||
-				(!req_tlr_or_trst&&jtag_trst))&&
+				(!req_tlr_or_trst && jtag_trst))&&
 				((req_srst&&!jtag_srst)||
-						(!req_srst&&jtag_srst)))
+						(!req_srst && jtag_srst)))
 		{
 			/* FIX!!! srst_pulls_trst allows 1,1 => 0,0 transition.... */
 			//LOG_ERROR("BUG: transition of req_tlr_or_trst and req_srst in the same jtag_add_reset() call is undefined");
@@ -676,7 +676,7 @@ tap_state_t jtag_set_end_state(tap_state_t state)
 		LOG_ERROR("BUG: TAP_DRSHIFT/IRSHIFT can't be end state. Calling code should use a larger scan field");
 	}
 
-	if (state!=TAP_INVALID)
+	if (state != TAP_INVALID)
 		cmd_queue_end_state = state;
 	return cmd_queue_end_state;
 }
@@ -746,7 +746,7 @@ void jtag_check_value_mask(scan_field_t *field, uint8_t *value, uint8_t *mask)
 {
 	assert(field->in_value != NULL);
 
-	if (value==NULL)
+	if (value == NULL)
 	{
 		/* no checking to do */
 		return;
@@ -1157,7 +1157,7 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 	}
 
 	jtag_add_tlr();
-	if ((retval=jtag_execute_queue())!=ERROR_OK)
+	if ((retval=jtag_execute_queue()) != ERROR_OK)
 		return retval;
 
 	/* examine chain first, as this could discover the real chain layout */
@@ -1216,7 +1216,7 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
 	if (jtag_reset_config & RESET_HAS_SRST)
 	{
 		jtag_add_reset(1, 1);
-		if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)
+		if ((jtag_reset_config & RESET_SRST_PULLS_TRST) == 0)
 			jtag_add_reset(0, 1);
 	}
 	jtag_add_reset(0, 0);
@@ -1238,7 +1238,7 @@ int jtag_init(struct command_context_s *cmd_ctx)
 	int retval;
 	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
 		return retval;
-	if (jtag_init_inner(cmd_ctx)==ERROR_OK)
+	if (jtag_init_inner(cmd_ctx) == ERROR_OK)
 	{
 		return ERROR_OK;
 	}