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

[<oh...@ma...>]

Author: oharboe
Date: 2009-04-19 10:05:54 +0200 (Sun, 19 Apr 2009)
New Revision: 1464

Modified:
   trunk/src/jtag/amt_jtagaccel.c
   trunk/src/jtag/dummy.c
   trunk/src/jtag/gw16012.c
   trunk/src/jtag/jtag.c
Log:
Zach Welch <zw...@su...>  use tap_state_t

Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c	2009-04-19 08:04:23 UTC (rev 1463)
+++ trunk/src/jtag/amt_jtagaccel.c	2009-04-19 08:05:54 UTC (rev 1464)
@@ -156,7 +156,7 @@
 	return ERROR_OK;
 }
 
-void amt_jtagaccel_end_state(int state)
+void amt_jtagaccel_end_state(tap_state_t state)
 {
 	if (tap_is_state_stable(state))
 		tap_set_end_state(state);

Modified: trunk/src/jtag/dummy.c
===================================================================
--- trunk/src/jtag/dummy.c	2009-04-19 08:04:23 UTC (rev 1463)
+++ trunk/src/jtag/dummy.c	2009-04-19 08:05:54 UTC (rev 1464)
@@ -91,7 +91,7 @@
 	{
 		if( tck )
 		{
-			int old_state = dummy_state;
+			tap_state_t old_state = dummy_state;
 			dummy_state = tap_state_transition( old_state, tms );
 
 			if( old_state != dummy_state )

Modified: trunk/src/jtag/gw16012.c
===================================================================
--- trunk/src/jtag/gw16012.c	2009-04-19 08:04:23 UTC (rev 1463)
+++ trunk/src/jtag/gw16012.c	2009-04-19 08:05:54 UTC (rev 1464)
@@ -194,7 +194,7 @@
 	return ERROR_OK;
 }
 
-void gw16012_end_state(int state)
+void gw16012_end_state(tap_state_t state)
 {
 	if (tap_is_state_stable(state))
 		tap_set_end_state(state);

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-04-19 08:04:23 UTC (rev 1463)
+++ trunk/src/jtag/jtag.c	2009-04-19 08:05:54 UTC (rev 1464)
@@ -219,7 +219,7 @@
 void jtag_add_end_state(tap_state_t endstate);
 void jtag_add_sleep(u32 us);
 int jtag_execute_queue(void);
-int tap_state_by_name(const char *name);
+tap_state_t tap_state_by_name(const char *name);
 
 /* jtag commands */
 int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -2652,7 +2652,7 @@
 
 int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	int state;
+	tap_state_t state;
 
 	if (argc < 1)
 	{
@@ -2665,7 +2665,7 @@
 			command_print( cmd_ctx, "Invalid state name: %s\n", args[0] );
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
-		jtag_add_end_state( (tap_state_t)(state));
+		jtag_add_end_state(state);
 		jtag_execute_queue();
 	}
 	command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state));
@@ -2729,7 +2729,7 @@
 	int i;
 	scan_field_t *fields;
 	jtag_tap_t *tap;
-	int endstate;
+	tap_state_t endstate;
 
 	if ((argc < 2) || (argc % 2))
 	{
@@ -2807,7 +2807,7 @@
 	int field_count = 0;
 	int i, e;
 	jtag_tap_t *tap;
-	int endstate;
+	tap_state_t endstate;
 
 	/* args[1] = device
 	 * args[2] = num_bits
@@ -3269,9 +3269,9 @@
 	return ret;
 }
 
-int tap_state_by_name( const char *name )
+tap_state_t tap_state_by_name( const char *name )
 {
-	int x;
+	tap_state_t x;
 
 	for( x = 0 ; x < TAP_NUM_STATES ; x++ ){
 		/* be nice to the human */