X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fcore.c;h=dd5c0a0e21b81133b673694debec364b92ef2615;hp=ed16bdbfe871065fcb9f4a390e480f896eb3d742;hb=50c086ffb94f199c088f4cc52b7887b668dddf00;hpb=333642fcff9901a8f20c02457756ca9715641139

diff --git a/src/jtag/core.c b/src/jtag/core.c
index ed16bdbfe8..dd5c0a0e21 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;
 }
@@ -510,11 +510,11 @@ int jtag_add_statemove(tap_state_t 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);
@@ -862,10 +862,13 @@ static void jtag_examine_chain_display(enum log_levels level, const char *msg,
 		const char *name, uint32_t idcode)
 {
 	log_printf_lf(level, __FILE__, __LINE__, __FUNCTION__,
-			"JTAG tap: %s %16.16s: 0x%08x "
-			"(mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
-		name, msg, idcode,
-		EXTRACT_MFG(idcode), EXTRACT_PART(idcode), EXTRACT_VER(idcode) );
+				  "JTAG tap: %s %16.16s: 0x%08x "
+				  "(mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+				  name, msg, 
+				  (unsigned int)idcode,
+				  (unsigned int)EXTRACT_MFG(idcode), 
+				  (unsigned int)EXTRACT_PART(idcode), 
+				  (unsigned int)EXTRACT_VER(idcode) );
 }
 
 static bool jtag_idcode_is_final(uint32_t idcode)
@@ -889,7 +892,7 @@ static void jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned ma
 		if (!triggered && jtag_idcode_is_final(idcode))
 			continue;
 		LOG_WARNING("Unexpected idcode after end of chain: %d 0x%08x",
-				count, idcode);
+					count, (unsigned int)idcode);
 		triggered = true;
 	}
 }
@@ -1023,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;
@@ -1047,7 +1050,7 @@ int jtag_validate_chain(void)
 	int val;
 	for(;;){
 		tap = jtag_tap_next_enabled(tap);
-		if( tap == NULL ){
+		if ( tap == NULL ){
 			break;
 		}
 
@@ -1100,7 +1103,7 @@ void jtag_tap_init(jtag_tap_t *tap)
 	LOG_DEBUG("Created Tap: %s @ abs position %d, "
 			"irlen %d, capture: 0x%x mask: 0x%x", tap->dotted_name,
 				tap->abs_chain_position, tap->ir_length,
-				tap->ir_capture_value, tap->ir_capture_mask);
+			  (unsigned int)(tap->ir_capture_value), (unsigned int)(tap->ir_capture_mask));
 	jtag_tap_add(tap);
 }
 
@@ -1127,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;
@@ -1148,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;
 	}