X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fcore.c;h=330eb78346ccd234333c8b7ed4ce3c9cb18f701e;hp=5bf7295ec78c33e60dec22407d286125db34a555;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=40d7e81c45d112522f021205f7f1b46f025b8984

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 5bf7295ec7..330eb78346 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -142,7 +142,7 @@ unsigned jtag_tap_count_enabled(void)
 {
 	jtag_tap_t *t = jtag_all_taps();
 	unsigned n = 0;
-	while(t)
+	while (t)
 	{
 		if (t->enabled)
 			n++;
@@ -157,7 +157,7 @@ void jtag_tap_add(struct jtag_tap_s *t)
 	t->abs_chain_position = jtag_num_taps++;
 
 	jtag_tap_t **tap = &__jtag_all_taps;
-	while(*tap != NULL)
+	while (*tap != NULL)
 		tap = &(*tap)->next_tap;
 	*tap = t;
 }
@@ -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 */
 
@@ -333,8 +333,8 @@ void jtag_add_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t st
 			/* if we are to run a verification of the ir scan, we need to get the input back.
 			 * We may have to allocate space if the caller didn't ask for the input back.
 			 */
-			in_fields[j].check_value=in_fields[j].tap->expected;
-			in_fields[j].check_mask=in_fields[j].tap->expected_mask;
+			in_fields[j].check_value = in_fields[j].tap->expected;
+			in_fields[j].check_mask = in_fields[j].tap->expected_mask;
 		}
 		jtag_add_scan_check(jtag_add_ir_scan_noverify, in_num_fields, in_fields, state);
 	} else
@@ -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) );
+		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();
 	}
-	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,8 +531,8 @@ 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
-		||   tap_state_transition(cur_state, false) == 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);
 	}
@@ -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;
@@ -754,7 +754,7 @@ void jtag_check_value_mask(scan_field_t *field, uint8_t *value, uint8_t *mask)
 
 	jtag_execute_queue_noclear();
 
-	int retval=jtag_check_value_inner(field->in_value, value, mask, field->num_bits);
+	int retval = jtag_check_value_inner(field->in_value, value, mask, field->num_bits);
 	jtag_set_error(retval);
 }
 
@@ -868,7 +868,7 @@ static void jtag_examine_chain_display(enum log_levels level, const char *msg,
 				  (unsigned int)idcode,
 				  (unsigned int)EXTRACT_MFG(idcode), 
 				  (unsigned int)EXTRACT_PART(idcode), 
-				  (unsigned int)EXTRACT_VER(idcode) );
+				  (unsigned int)EXTRACT_VER(idcode));
 }
 
 static bool jtag_idcode_is_final(uint32_t idcode)
@@ -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
@@ -1024,9 +1024,9 @@ int jtag_validate_chain(void)
 
 	tap = NULL;
 	total_ir_length = 0;
-	for(;;){
+	for (;;){
 		tap = jtag_tap_next_enabled(tap);
-		if( tap == NULL ){
+		if (tap == NULL){
 			break;
 		}
 		total_ir_length += tap->ir_length;
@@ -1048,9 +1048,9 @@ int jtag_validate_chain(void)
 	tap = NULL;
 	chain_pos = 0;
 	int val;
-	for(;;){
+	for (;;){
 		tap = jtag_tap_next_enabled(tap);
-		if( tap == NULL ){
+		if (tap == NULL){
 			break;
 		}
 
@@ -1130,7 +1130,7 @@ int jtag_interface_init(struct command_context_s *cmd_ctx)
 		LOG_ERROR("JTAG interface has to be specified, see \"interface\" command");
 		return ERROR_JTAG_INVALID_INTERFACE;
 	}
-	if(hasKHz)
+	if (hasKHz)
 	{
 		jtag_interface->khz(jtag_get_speed_khz(), &jtag_speed);
 		hasKHz = false;
@@ -1151,13 +1151,13 @@ 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;
 	}
 
 	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 */
@@ -1192,7 +1192,7 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
 {
 	int retval;
 
-	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+	if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK)
 		return retval;
 
 	LOG_DEBUG("Trying to bring the JTAG controller to life by asserting TRST / RESET");
@@ -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);
@@ -1236,9 +1236,9 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
 int jtag_init(struct command_context_s *cmd_ctx)
 {
 	int retval;
-	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+	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;
 	}