[Openocd-svn] r2731 - trunk/src/jtag

[dbrownell at B. <dbr...@ma...>]

Author: dbrownell
Date: 2009-09-19 08:54:01 +0200 (Sat, 19 Sep 2009)
New Revision: 2731

Modified:
   trunk/src/jtag/ft2232.c
Log:
Style cleanup for the updated ft2232_add_pathmove().
Indentation, whitespace, line lengths.


Modified: trunk/src/jtag/ft2232.c
===================================================================
--- trunk/src/jtag/ft2232.c	2009-09-19 06:49:40 UTC (rev 2730)
+++ trunk/src/jtag/ft2232.c	2009-09-19 06:54:01 UTC (rev 2731)
@@ -773,38 +773,41 @@
 	/* this loop verifies that the path is legal and logs each state in the path */
 	while (num_states)
 	{
-		unsigned char  tms_byte = 0;       /* zero this on each MPSSE batch */
+		unsigned char	tms_byte = 0;       /* zero this on each MPSSE batch */
+		int		bit_count = 0;
+		int		num_states_batch = num_states > 7 ? 7 : num_states;
 
-		int bit_count = 0;
-
-		int num_states_batch = num_states > 7 ? 7 : num_states;
-
 		/* command "Clock Data to TMS/CS Pin (no Read)" */
 		buffer_write(0x4b);
 
 		/* number of states remaining */
 		buffer_write(num_states_batch - 1);
 
-		while (num_states_batch--)
-		{
-		  if (tap_state_transition(tap_get_state(), false) == path[state_count])
+		while (num_states_batch--) {
+			/* either TMS=0 or TMS=1 must work ... */
+			if (tap_state_transition(tap_get_state(), false)
+						== path[state_count])
 				buf_set_u32(&tms_byte, bit_count++, 1, 0x0);
-		  else if (tap_state_transition(tap_get_state(), true) == path[state_count])
+			else if (tap_state_transition(tap_get_state(), true)
+						== path[state_count])
 				buf_set_u32(&tms_byte, bit_count++, 1, 0x1);
-			else
-			{
-				LOG_ERROR( "BUG: %s -> %s isn't a valid TAP transition", tap_state_name(
-								 tap_get_state() ), tap_state_name(path[state_count]) );
+
+			/* ... or else the caller goofed BADLY */
+			else {
+				LOG_ERROR("BUG: %s -> %s isn't a valid "
+						"TAP state transition",
+					tap_state_name(tap_get_state()),
+					tap_state_name(path[state_count]));
 				exit(-1);
 			}
 
-		  tap_set_state(path[state_count]);
+			tap_set_state(path[state_count]);
 			state_count++;
 			num_states--;
 		}
 
 		buffer_write(tms_byte);
-	}	
+	}
 	tap_set_end_state(tap_get_state());
 }