openocd-commit — OpenOCD commit maling list - read only

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:43:23 +0200 (Fri, 05 Jun 2009)
New Revision: 2067

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_NumTotalTaps' as 'jtag_tap_count.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:43:12 UTC (rev 2066)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:23 UTC (rev 2067)
@@ -241,7 +241,7 @@
 	return __jtag_all_taps;
 };
 
-int jtag_NumTotalTaps(void)
+int jtag_tap_count(void)
 {
 	return jtag_num_taps;
 }
@@ -1103,7 +1103,7 @@
 	if (device_count != jtag_NumEnabledTaps())
 	{
 		LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match (enabled) configuration (%i), total taps: %d",
-				  device_count, jtag_NumEnabledTaps(), jtag_NumTotalTaps());
+				  device_count, jtag_NumEnabledTaps(), jtag_tap_count());
 		LOG_ERROR("check the config file and ensure proper JTAG communication (connections, speed, ...)");
 		return ERROR_JTAG_INIT_FAILED;
 	}
@@ -1898,9 +1898,9 @@
 
 	newargs[0] = Jim_NewStringObj( interp, "jtag", -1   );
 	newargs[1] = Jim_NewStringObj( interp, "newtap", -1 );
-	sprintf( buf, "chip%d", jtag_NumTotalTaps() );
+	sprintf( buf, "chip%d", jtag_tap_count() );
 	newargs[2] = Jim_NewStringObj( interp, buf, -1 );
-	sprintf( buf, "tap%d", jtag_NumTotalTaps() );
+	sprintf( buf, "tap%d", jtag_tap_count() );
 	newargs[3] = Jim_NewStringObj( interp, buf, -1  );
 	newargs[4] = Jim_NewStringObj( interp, "-irlen", -1  );
 	newargs[5] = Jim_NewStringObj( interp, args[0], -1  );

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:43:12 UTC (rev 2066)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:23 UTC (rev 2067)
@@ -182,7 +182,7 @@
 extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
-extern int jtag_NumTotalTaps(void);
+extern int jtag_tap_count(void);
 
 static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)
 {

[Openocd-svn] r2066 - in trunk/src: jtag target

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:43:12 +0200 (Fri, 05 Jun 2009)
New Revision: 2066

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/target/target.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByJimObj' as 'jtag_tap_by_jim_obj.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:52 UTC (rev 2065)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:12 UTC (rev 2066)
@@ -300,7 +300,7 @@
 	return t;
 }
 
-jtag_tap_t * jtag_TapByJimObj( Jim_Interp *interp, Jim_Obj *o )
+jtag_tap_t * jtag_tap_by_jim_obj( Jim_Interp *interp, Jim_Obj *o )
 {
 	jtag_tap_t *t;
 	const char *cp;
@@ -1535,7 +1535,7 @@
 
 		{
 			jtag_tap_t *t;
-			t = jtag_TapByJimObj( goi.interp, goi.argv[0] );
+			t = jtag_tap_by_jim_obj( goi.interp, goi.argv[0] );
 			if( t == NULL ){
 				return JIM_ERR;
 			}
@@ -1569,7 +1569,7 @@
 			jtag_tap_t *t;
 
 			Jim_GetOpt_Obj(&goi, &o);
-			t = jtag_TapByJimObj( goi.interp, o );
+			t = jtag_tap_by_jim_obj( goi.interp, o );
 			if( t == NULL ){
 				return JIM_ERR;
 			}
@@ -1589,7 +1589,7 @@
 			jtag_tap_t *t;
 
 			Jim_GetOpt_Obj(&goi, &o);
-			t = jtag_TapByJimObj( goi.interp, o );
+			t = jtag_tap_by_jim_obj( goi.interp, o );
 			if( t == NULL ){
 				return JIM_ERR;
 			}
@@ -2434,7 +2434,7 @@
 		}
 	} /* validate args */
 
-	tap = jtag_TapByJimObj( interp, args[1] );
+	tap = jtag_tap_by_jim_obj( interp, args[1] );
 	if( tap == NULL ){
 		return JIM_ERR;
 	}

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:52 UTC (rev 2065)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:12 UTC (rev 2066)
@@ -179,7 +179,7 @@
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
-extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
+extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
 extern int jtag_NumTotalTaps(void);

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-06-05 00:42:52 UTC (rev 2065)
+++ trunk/src/target/target.c	2009-06-05 00:43:12 UTC (rev 2066)
@@ -3450,7 +3450,7 @@
 				if( e != JIM_OK ){
 					return e;
 				}
-				tap = jtag_TapByJimObj( goi->interp, o );
+				tap = jtag_tap_by_jim_obj( goi->interp, o );
 				if( tap == NULL ){
 					return JIM_ERR;
 				}

[Openocd-svn] r2065 - in trunk/src: jtag pld target xsvf

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:42:52 +0200 (Fri, 05 Jun 2009)
New Revision: 2065

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11.c
   trunk/src/target/etb.c
   trunk/src/xsvf/xsvf.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByString' as 'jtag_tap_by_string.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -273,7 +273,7 @@
 	*tap = t;
 }
 
-jtag_tap_t *jtag_TapByString( const char *s )
+jtag_tap_t *jtag_tap_by_string( const char *s )
 {
 	jtag_tap_t *t;
 	char *cp;
@@ -310,7 +310,7 @@
 		cp = "(unknown)";
 		t = NULL;
 	}  else {
-		t = jtag_TapByString( cp );
+		t = jtag_tap_by_string( cp );
 	}
 	if( t == NULL ){
 		Jim_SetResult_sprintf(interp,"Tap: %s is unknown", cp );
@@ -2326,7 +2326,7 @@
 
 	for (i = 0; i < num_fields; i++)
 	{
-		tap = jtag_TapByString( args[i*2] );
+		tap = jtag_tap_by_string( args[i*2] );
 		if (tap==NULL)
 		{
 			command_print( cmd_ctx, "Tap: %s unknown", args[i*2] );

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:52 UTC (rev 2065)
@@ -178,7 +178,7 @@
 extern jtag_tap_t* jtag_all_taps(void);
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_tap_by_position(int n);
-extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
+extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/pld/virtex2.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -247,7 +247,7 @@
 		return ERROR_PLD_DEVICE_INVALID;
 	}
 
-	tap = jtag_TapByString( args[1] );
+	tap = jtag_tap_by_string( args[1] );
 	if( tap == NULL ){
 		command_print( cmd_ctx, "Tap: %s does not exist", args[1] );
 		return ERROR_OK;

Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/target/arm11.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -1837,7 +1837,7 @@
 	jtag_tap_t *	tap;
 	target_t *		t;
 
-	tap = jtag_TapByString(arg);
+	tap = jtag_tap_by_string(arg);
 
 	if (!tap)
 		return 0;

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/target/etb.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -386,7 +386,7 @@
 		return ERROR_FAIL;
 	}
 
-	tap = jtag_TapByString( args[1] );
+	tap = jtag_tap_by_string( args[1] );
 	if (tap == NULL)
 	{
 		command_print(cmd_ctx, "Tap: %s does not exist", args[1] );

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/xsvf/xsvf.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -232,7 +232,7 @@
 
 	if (strcmp(args[0], "plain") != 0)
 	{
-		tap = jtag_TapByString( args[0] );
+		tap = jtag_tap_by_string( args[0] );
 		if (!tap )
 		{
 			command_print( cmd_ctx, "Tap: %s unknown", args[0] );

[Openocd-svn] r2064 - in trunk/src: flash jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:42:39 +0200 (Fri, 05 Jun 2009)
New Revision: 2064

Modified:
   trunk/src/flash/str9xpec.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByAbsPosition' as 'jtag_tap_by_abs_position.'


Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-06-05 00:42:32 UTC (rev 2063)
+++ trunk/src/flash/str9xpec.c	2009-06-05 00:42:39 UTC (rev 2064)
@@ -325,7 +325,7 @@
 	arm7_9 = armv4_5->arch_info;
 	jtag_info = &arm7_9->jtag_info;
 
-	str9xpec_info->tap = jtag_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1);
+	str9xpec_info->tap = jtag_tap_by_abs_position( jtag_info->tap->abs_chain_position - 1);
 	str9xpec_info->isc_enable = 0;
 
 	str9xpec_build_block_list(bank);

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:32 UTC (rev 2063)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:39 UTC (rev 2064)
@@ -294,7 +294,7 @@
 		n = strtol( s, &cp, 0 );
 		if( (s != cp) && (*cp == 0) ){
 			/* Then it is... */
-			t = jtag_TapByAbsPosition(n);
+			t = jtag_tap_by_abs_position(n);
 		}
 	}
 	return t;
@@ -319,7 +319,7 @@
 }
 
 /* returns a pointer to the n-th device in the scan chain */
-jtag_tap_t * jtag_TapByAbsPosition( int n )
+jtag_tap_t * jtag_tap_by_abs_position( int n )
 {
 	int orig_n;
 	jtag_tap_t *t;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:32 UTC (rev 2063)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:39 UTC (rev 2064)
@@ -180,7 +180,7 @@
 extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
-extern jtag_tap_t* jtag_TapByAbsPosition(int abs_position);
+extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
 extern int jtag_NumTotalTaps(void);
 

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:42:32 +0200 (Fri, 05 Jun 2009)
New Revision: 2063

Modified:
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByPosition' as 'jtag_tap_by_position.'


Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:25 UTC (rev 2062)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:32 UTC (rev 2063)
@@ -177,7 +177,7 @@
 };
 extern jtag_tap_t* jtag_all_taps(void);
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
-extern jtag_tap_t* jtag_TapByPosition(int n);
+extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_TapByAbsPosition(int abs_position);

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:42:25 +0200 (Fri, 05 Jun 2009)
New Revision: 2062

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_AllTaps' as 'jtag_all_taps.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:17 UTC (rev 2061)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:25 UTC (rev 2062)
@@ -236,7 +236,7 @@
 static int handle_verify_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_tms_sequence_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
-jtag_tap_t *jtag_AllTaps(void)
+jtag_tap_t *jtag_all_taps(void)
 {
 	return __jtag_all_taps;
 };
@@ -252,7 +252,7 @@
 	int n;
 
 	n = 0;
-	t = jtag_AllTaps();
+	t = jtag_all_taps();
 	while(t){
 		if( t->enabled ){
 			n++;
@@ -278,7 +278,7 @@
 	jtag_tap_t *t;
 	char *cp;
 
-	t = jtag_AllTaps();
+	t = jtag_all_taps();
 	/* try name first */
 	while(t){
 		if( 0 == strcmp( t->dotted_name, s ) ){
@@ -325,7 +325,7 @@
 	jtag_tap_t *t;
 
 	orig_n = n;
-	t = jtag_AllTaps();
+	t = jtag_all_taps();
 
 	while( t && (n > 0)) {
 		n--;
@@ -1933,7 +1933,7 @@
 {
 	jtag_tap_t *tap;
 
-	tap = jtag_AllTaps();
+	tap = jtag_all_taps();
 	command_print(cmd_ctx, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
 	command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
 

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:17 UTC (rev 2061)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:25 UTC (rev 2062)
@@ -175,7 +175,7 @@
 
 	jtag_tap_t* next_tap;
 };
-extern jtag_tap_t* jtag_AllTaps(void);
+extern jtag_tap_t* jtag_all_taps(void);
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_TapByPosition(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
@@ -189,7 +189,7 @@
 	if (p == NULL)
 	{
 		/* start at the head of list */
-		p = jtag_AllTaps();
+		p = jtag_all_taps();
 	}
 	else
 	{

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:42:17 +0200 (Fri, 05 Jun 2009)
New Revision: 2061

Modified:
   trunk/src/jtag/jtag.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_all_taps' as '__jtag_all_taps.'
- Frees original symbol name to rename the accessor function.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:06:34 UTC (rev 2060)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:17 UTC (rev 2061)
@@ -66,9 +66,9 @@
 /**
  * List all TAPs that have been created.
  */
-static jtag_tap_t *jtag_all_taps = NULL;
+static jtag_tap_t *__jtag_all_taps = NULL;
 /**
- * The number of TAPs in the jtag_all_taps list, used to track the
+ * The number of TAPs in the __jtag_all_taps list, used to track the
  * assigned chain position to new TAPs
  */
 static int jtag_num_taps = 0;
@@ -238,7 +238,7 @@
 
 jtag_tap_t *jtag_AllTaps(void)
 {
-	return jtag_all_taps;
+	return __jtag_all_taps;
 };
 
 int jtag_NumTotalTaps(void)
@@ -267,7 +267,7 @@
 {
 	t->abs_chain_position = jtag_num_taps++;
 
-	jtag_tap_t **tap = &jtag_all_taps;
+	jtag_tap_t **tap = &__jtag_all_taps;
 	while(*tap != NULL)
 		tap = &(*tap)->next_tap;
 	*tap = t;

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:06:34 +0200 (Fri, 05 Jun 2009)
New Revision: 2060

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Add accessors for jtag_verify; use them in jim command handler.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:04:12 UTC (rev 2059)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:06:34 UTC (rev 2060)
@@ -2524,27 +2524,33 @@
 	return ERROR_OK;
 }
 
+void jtag_set_verify(bool enable)
+{
+	jtag_verify = enable;
+}
+
+bool jtag_will_verify()
+{
+	return jtag_verify;
+}
+
 static int handle_verify_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+	if (argc > 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	if (argc == 1)
 	{
 		if (strcmp(args[0], "enable") == 0)
-		{
-			jtag_verify = 1;
-		}
+			jtag_set_verify(true);
 		else if (strcmp(args[0], "disable") == 0)
-		{
-			jtag_verify = 0;
-		} else
-		{
+			jtag_set_verify(false);
+		else
 			return ERROR_COMMAND_SYNTAX_ERROR;
-		}
-	} else if (argc != 0)
-	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	command_print(cmd_ctx, "verify jtag capture is %s", (jtag_verify) ? "enabled": "disabled");
+	const char *status = jtag_will_verify() ? "enabled": "disabled";
+	command_print(cmd_ctx, "verify jtag capture is %s", status);
 
 	return ERROR_OK;
 }

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:04:12 UTC (rev 2059)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:06:34 UTC (rev 2060)
@@ -640,11 +640,15 @@
  */
 extern int jtag_add_statemove(tap_state_t goal_state);
 
+
+
 /// @returns the number of times the scan queue has been flushed
 int jtag_get_flush_queue_count(void);
 void jtag_set_nsrst_delay(unsigned delay);
 void jtag_set_ntrst_delay(unsigned delay);
 void jtag_set_speed_khz(unsigned speed);
 unsigned jtag_get_speed_khz(void);
+void jtag_set_verify(bool enable);
+bool jtag_will_verify(void);
 
 #endif /* JTAG_H */

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:04:12 +0200 (Fri, 05 Jun 2009)
New Revision: 2059

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Add accessors for reset delays; use them in jim command handlers.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:02:00 UTC (rev 2058)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:04:12 UTC (rev 2059)
@@ -2085,7 +2085,7 @@
 	}
 	else
 	{
-		jtag_nsrst_delay = strtoul(args[0], NULL, 0);
+		jtag_set_nsrst_delay(strtoul(args[0], NULL, 0));
 	}
 
 	return ERROR_OK;
@@ -2100,12 +2100,13 @@
 	}
 	else
 	{
-		jtag_ntrst_delay = strtoul(args[0], NULL, 0);
+		jtag_set_ntrst_delay(strtoul(args[0], NULL, 0));
 	}
 
 	return ERROR_OK;
 }
 
+
 static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 	int retval=ERROR_OK;
@@ -2699,3 +2700,13 @@
 	return retval;
 }
 
+void jtag_set_nsrst_delay(unsigned delay)
+{
+	jtag_nsrst_delay = delay;
+}
+void jtag_set_ntrst_delay(unsigned delay)
+{
+	jtag_ntrst_delay = delay;
+}
+
+

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:02:00 UTC (rev 2058)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:04:12 UTC (rev 2059)
@@ -642,6 +642,8 @@
 
 /// @returns the number of times the scan queue has been flushed
 int jtag_get_flush_queue_count(void);
+void jtag_set_nsrst_delay(unsigned delay);
+void jtag_set_ntrst_delay(unsigned delay);
 void jtag_set_speed_khz(unsigned speed);
 unsigned jtag_get_speed_khz(void);
 

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 02:02:00 +0200 (Fri, 05 Jun 2009)
New Revision: 2058

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Add accessors for speed_khz; use them in jim command handler.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 23:52:58 UTC (rev 2057)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:02:00 UTC (rev 2058)
@@ -1659,7 +1659,7 @@
 	}
 	if(hasKHz)
 	{
-		jtag_interface->khz(speed_khz, &jtag_speed);
+		jtag_interface->khz(jtag_get_speed_khz(), &jtag_speed);
 		hasKHz = false;
 	}
 
@@ -1772,6 +1772,15 @@
 	return jtag_init_reset(cmd_ctx);
 }
 
+void jtag_set_speed_khz(unsigned khz)
+{
+	speed_khz = khz;
+}
+unsigned jtag_get_speed_khz(void)
+{
+	return speed_khz;
+}
+
 static int default_khz(int khz, int *jtag_speed)
 {
 	LOG_ERROR("Translation from khz to jtag_speed not implemented");
@@ -2130,17 +2139,17 @@
 	int retval=ERROR_OK;
 	LOG_DEBUG("handle jtag khz");
 
+	int cur_speed = 0;
 	if(argc == 1)
 	{
-		speed_khz = strtoul(args[0], NULL, 0);
+		jtag_set_speed_khz(strtoul(args[0], NULL, 0));
 		if (jtag != NULL)
 		{
-			int cur_speed = 0;
 			LOG_DEBUG("have interface set up");
 			int speed_div1;
-			if ((retval=jtag->khz(speed_khz, &speed_div1))!=ERROR_OK)
+			if ((retval=jtag->khz(jtag_get_speed_khz(), &speed_div1))!=ERROR_OK)
 			{
-				speed_khz = 0;
+				jtag_set_speed_khz(0);
 				return retval;
 			}
 
@@ -2157,20 +2166,18 @@
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
+	cur_speed = jtag_get_speed_khz();
 
 	if (jtag!=NULL)
 	{
-		if ((retval=jtag->speed_div(jtag_speed, &speed_khz))!=ERROR_OK)
+		if ((retval=jtag->speed_div(jtag_speed, &cur_speed))!=ERROR_OK)
 			return retval;
 	}
 
-	if (speed_khz==0)
-	{
+	if (cur_speed)
+		command_print(cmd_ctx, "%d kHz", cur_speed);
+	else
 		command_print(cmd_ctx, "RCLK - adaptive");
-	} else
-	{
-		command_print(cmd_ctx, "%d kHz", speed_khz);
-	}
 	return retval;
 
 }

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 23:52:58 UTC (rev 2057)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:02:00 UTC (rev 2058)
@@ -642,5 +642,7 @@
 
 /// @returns the number of times the scan queue has been flushed
 int jtag_get_flush_queue_count(void);
+void jtag_set_speed_khz(unsigned speed);
+unsigned jtag_get_speed_khz(void);
 
 #endif /* JTAG_H */

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 01:52:58 +0200 (Fri, 05 Jun 2009)
New Revision: 2057

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Add jtag_get_flush_queue_count accessor to help future factoring.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 23:49:52 UTC (rev 2056)
+++ trunk/src/jtag/jtag.c	2009-06-04 23:52:58 UTC (rev 2057)
@@ -909,6 +909,11 @@
 	}
 }
 
+int jtag_get_flush_queue_count(void)
+{
+	return jtag_flush_queue_count;
+}
+
 int jtag_execute_queue(void)
 {
 	int retval;
@@ -2480,7 +2485,7 @@
 
 static int Jim_Command_flush_count(Jim_Interp *interp, int argc, Jim_Obj *const *args)
 {
-	Jim_SetResult(interp, Jim_NewIntObj(interp, jtag_flush_queue_count));
+	Jim_SetResult(interp, Jim_NewIntObj(interp, jtag_get_flush_queue_count()));
 
 	return JIM_OK;
 }

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 23:49:52 UTC (rev 2056)
+++ trunk/src/jtag/jtag.h	2009-06-04 23:52:58 UTC (rev 2057)
@@ -640,4 +640,7 @@
  */
 extern int jtag_add_statemove(tap_state_t goal_state);
 
+/// @returns the number of times the scan queue has been flushed
+int jtag_get_flush_queue_count(void);
+
 #endif /* JTAG_H */

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 01:49:52 +0200 (Fri, 05 Jun 2009)
New Revision: 2056

Modified:
   trunk/src/jtag/jtag.c
Log:
Clean up the JTAG TAP creation handler:
- Factor jtag_tap_init() helper out of the end of jim_newtap_cmd.
- Factor jtag_tap_free() helper out of the error case in jim_newtap_cmd.
- Invert test to improve indentation at the end of jim_newtap_cmd.
- Improve whitespace in the newly factored functions.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 23:26:58 UTC (rev 2055)
+++ trunk/src/jtag/jtag.c	2009-06-04 23:49:52 UTC (rev 2056)
@@ -1270,6 +1270,41 @@
 	return JIM_OK;
 }
 
+
+static void jtag_tap_init(jtag_tap_t *tap)
+{
+	assert(0 != tap->ir_length);
+
+	tap->expected = malloc(tap->ir_length);
+	tap->expected_mask = malloc(tap->ir_length);
+	tap->cur_instr = malloc(tap->ir_length);
+
+	buf_set_u32(tap->expected, 0, tap->ir_length, tap->ir_capture_value);
+	buf_set_u32(tap->expected_mask, 0, tap->ir_length, tap->ir_capture_mask);
+	buf_set_ones(tap->cur_instr, tap->ir_length);
+
+	// place TAP in bypass mode
+	tap->bypass = 1;
+	// register the reset callback for the TAP
+	jtag_register_event_callback(&jtag_reset_callback, 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);
+	jtag_tap_add(tap);
+}
+
+static void jtag_tap_free(jtag_tap_t *tap)
+{
+	/// @todo is anything missing? no memory leaks please 
+	free((void *)tap->expected_ids);
+	free((void *)tap->chip);
+	free((void *)tap->tapname);
+	free((void *)tap->dotted_name);
+	free(tap);
+}
+
 static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 {
 	jtag_tap_t *pTap;
@@ -1404,49 +1439,18 @@
 		} /* switch(n->value) */
 	} /* while( goi->argc ) */
 
-	/* Did we get all the options? */
-	if( reqbits ){
-		// no
-		Jim_SetResult_sprintf( goi->interp,
-							   "newtap: %s missing required parameters",
-							   pTap->dotted_name);
-		/* TODO: Tell user what is missing :-( */
-		/* no memory leaks pelase */
-		free(((void *)(pTap->expected_ids)));
-		free(((void *)(pTap->chip)));
-		free(((void *)(pTap->tapname)));
-		free(((void *)(pTap->dotted_name)));
-		free(((void *)(pTap)));
-		return JIM_ERR;
+	/* Did all the required option bits get cleared? */
+	if (0 == reqbits)
+	{
+		jtag_tap_init(pTap);
+		return ERROR_OK;
 	}
 
-	pTap->expected      = malloc( pTap->ir_length );
-	pTap->expected_mask = malloc( pTap->ir_length );
-	pTap->cur_instr     = malloc( pTap->ir_length );
-
-	buf_set_u32( pTap->expected,
-				 0,
-				 pTap->ir_length,
-				 pTap->ir_capture_value );
-	buf_set_u32( pTap->expected_mask,
-				 0,
-				 pTap->ir_length,
-				 pTap->ir_capture_mask );
-	buf_set_ones( pTap->cur_instr,
-				  pTap->ir_length );
-
-	pTap->bypass = 1;
-
-	jtag_register_event_callback(jtag_reset_callback, pTap );
-
-	jtag_tap_add(pTap);
-
-	LOG_DEBUG("Created Tap: %s @ abs position %d, "
-		"irlen %d, capture: 0x%x mask: 0x%x", pTap->dotted_name,
-			pTap->abs_chain_position, pTap->ir_length,
-			pTap->ir_capture_value, pTap->ir_capture_mask);
-
-	return ERROR_OK;
+	Jim_SetResult_sprintf(goi->interp,
+			"newtap: %s missing required parameters",
+			pTap->dotted_name);
+	jtag_tap_free(pTap);
+	return JIM_ERR;
 }
 
 static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 01:26:58 +0200 (Fri, 05 Jun 2009)
New Revision: 2055

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Clean up the core JTAG TAP APIs:
- Move jtag_tap_name to same location as other TAP functions; export it.
- Factor new jtag_tap_add() from jim_newtap_cmd(); appends TAP to global list.
- Move static chain position counter to global; use in jtag_NumTotalTaps().
- Use jtag_AllTaps for reading tap list, instead of accessing global directly.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 22:43:34 UTC (rev 2054)
+++ trunk/src/jtag/jtag.c	2009-06-04 23:26:58 UTC (rev 2055)
@@ -63,7 +63,15 @@
 int jtag_trst = 0;
 int jtag_srst = 0;
 
+/**
+ * List all TAPs that have been created.
+ */
 static jtag_tap_t *jtag_all_taps = NULL;
+/**
+ * The number of TAPs in the jtag_all_taps list, used to track the
+ * assigned chain position to new TAPs
+ */
+static int jtag_num_taps = 0;
 
 enum reset_types jtag_reset_config = RESET_NONE;
 tap_state_t cmd_queue_end_state = TAP_RESET;
@@ -235,16 +243,7 @@
 
 int jtag_NumTotalTaps(void)
 {
-	jtag_tap_t *t;
-	int n;
-
-	n = 0;
-	t = jtag_AllTaps();
-	while(t){
-		n++;
-		t = t->next_tap;
-	}
-	return n;
+	return jtag_num_taps;
 }
 
 int jtag_NumEnabledTaps(void)
@@ -263,6 +262,17 @@
 	return n;
 }
 
+/// Append a new TAP to the chain of all taps.
+static 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)
+		tap = &(*tap)->next_tap;
+	*tap = t;
+}
+
 jtag_tap_t *jtag_TapByString( const char *s )
 {
 	jtag_tap_t *t;
@@ -324,6 +334,12 @@
 	return t;
 }
 
+const char *jtag_tap_name(const jtag_tap_t *tap)
+{
+	return (tap == NULL) ? "(unknown)" : tap->dotted_name;
+}
+
+
 int jtag_register_event_callback(int (*callback)(enum jtag_event event, void *priv), void *priv)
 {
 	jtag_event_callback_t **callbacks_p = &jtag_event_callbacks;
@@ -798,11 +814,6 @@
 	return;
 }
 
-static const char *jtag_tap_name(const jtag_tap_t *tap)
-{
-	return (tap == NULL) ? "(unknown)" : tap->dotted_name;
-}
-
 int jtag_check_value_inner(u8 *captured, u8 *in_check_value, u8 *in_check_mask, int num_bits)
 {
 	int retval = ERROR_OK;
@@ -1262,7 +1273,6 @@
 static int jim_newtap_cmd( Jim_GetOptInfo *goi )
 {
 	jtag_tap_t *pTap;
-	jtag_tap_t **ppTap;
 	jim_wide w;
 	int x;
 	int e;
@@ -1429,22 +1439,13 @@
 
 	jtag_register_event_callback(jtag_reset_callback, pTap );
 
-	ppTap = &(jtag_all_taps);
-	while( (*ppTap) != NULL ){
-		ppTap = &((*ppTap)->next_tap);
-	}
-	*ppTap = pTap;
-	{
-		static int n_taps = 0;
-		pTap->abs_chain_position = n_taps++;
-	}
-	LOG_DEBUG( "Created Tap: %s @ abs position %d, irlen %d, capture: 0x%x mask: 0x%x",
-				(*ppTap)->dotted_name,
-				(*ppTap)->abs_chain_position,
-				(*ppTap)->ir_length,
-				(*ppTap)->ir_capture_value,
-				(*ppTap)->ir_capture_mask );
+	jtag_tap_add(pTap);
 
+	LOG_DEBUG("Created Tap: %s @ abs position %d, "
+		"irlen %d, capture: 0x%x mask: 0x%x", pTap->dotted_name,
+			pTap->abs_chain_position, pTap->ir_length,
+			pTap->ir_capture_value, pTap->ir_capture_mask);
+
 	return ERROR_OK;
 }
 
@@ -1914,7 +1915,7 @@
 {
 	jtag_tap_t *tap;
 
-	tap = jtag_all_taps;
+	tap = jtag_AllTaps();
 	command_print(cmd_ctx, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
 	command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
 

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 22:43:34 UTC (rev 2054)
+++ trunk/src/jtag/jtag.h	2009-06-04 23:26:58 UTC (rev 2055)
@@ -176,6 +176,7 @@
 	jtag_tap_t* next_tap;
 };
 extern jtag_tap_t* jtag_AllTaps(void);
+extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_TapByPosition(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 00:43:34 +0200 (Fri, 05 Jun 2009)
New Revision: 2054

Modified:
   trunk/src/jtag/jtag.c
Log:
Change hasKHz to use bool type.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 22:41:21 UTC (rev 2053)
+++ trunk/src/jtag/jtag.c	2009-06-04 22:43:34 UTC (rev 2054)
@@ -86,7 +86,7 @@
 /* speed in kHz*/
 static int speed_khz = 0;
 /* flag if the kHz speed was defined */
-static int hasKHz = 0;
+static bool hasKHz = false;
 
 /* jtag interfaces (parport, FTDI-USB, TI-USB, ...)
  */
@@ -1650,7 +1650,7 @@
 	if(hasKHz)
 	{
 		jtag_interface->khz(speed_khz, &jtag_speed);
-		hasKHz = 0;
+		hasKHz = false;
 	}
 
 	if (jtag_interface->init() != ERROR_OK)
@@ -2139,7 +2139,7 @@
 			retval=jtag->speed(cur_speed);
 		} else
 		{
-			hasKHz = 1;
+			hasKHz = true;
 		}
 	} else if (argc==0)
 	{

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

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-05 00:41:21 +0200 (Fri, 05 Jun 2009)
New Revision: 2053

Modified:
   trunk/src/jtag/jtag.c
Log:
Add missing static keywords in JTAG source file.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 20:05:32 UTC (rev 2052)
+++ trunk/src/jtag/jtag.c	2009-06-04 22:41:21 UTC (rev 2053)
@@ -37,7 +37,8 @@
 #endif
 
 
-int jtag_flush_queue_count; /* count # of flushes for profiling / debugging purposes */
+/// The number of JTAG queue flushes (for profiling and debugging purposes).
+static int jtag_flush_queue_count;
 
 static void jtag_add_scan_check(void (*jtag_add_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state),
 		int in_num_fields, scan_field_t *in_fields, tap_state_t state);
@@ -906,7 +907,7 @@
 	return retval;
 }
 
-int jtag_reset_callback(enum jtag_event event, void *priv)
+static int jtag_reset_callback(enum jtag_event event, void *priv)
 {
 	jtag_tap_t *tap = priv;
 
@@ -928,7 +929,7 @@
 
 /* Try to examine chain layout according to IEEE 1149.1 §12
  */
-int jtag_examine_chain(void)
+static int jtag_examine_chain(void)
 {
 	jtag_tap_t *tap;
 	scan_field_t field;
@@ -1094,7 +1095,7 @@
 	return ERROR_OK;
 }
 
-int jtag_validate_chain(void)
+static int jtag_validate_chain(void)
 {
 	jtag_tap_t *tap;
 	int total_ir_length = 0;

[Openocd-svn] r2052 - trunk/src/target

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

Author: oharboe
Date: 2009-06-04 22:05:32 +0200 (Thu, 04 Jun 2009)
New Revision: 2052

Modified:
   trunk/src/target/arm11.h
Log:
unbreak arm11. TAP_INVALID is used to communicate inband that a special state should be used to lower level fn's in ARM11 code.

Modified: trunk/src/target/arm11.h
===================================================================
--- trunk/src/target/arm11.h	2009-06-04 13:45:50 UTC (rev 2051)
+++ trunk/src/target/arm11.h	2009-06-04 20:05:32 UTC (rev 2052)
@@ -47,7 +47,7 @@
 					 23 * ARM11_REGCACHE_MODEREGS +			\
 					  9 * ARM11_REGCACHE_FREGS)
 
-#define ARM11_TAP_DEFAULT			jtag_get_end_state()
+#define ARM11_TAP_DEFAULT			TAP_INVALID
 
 
 #define CHECK_RETVAL(action)								\

[Openocd-svn] r2051 - trunk/src/target

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2009-06-04 15:45:50 +0200 (Thu, 04 Jun 2009)
New Revision: 2051

Modified:
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/arm_adi_v5.h
   trunk/src/target/cortex_m3.c
Log:
- add support for different TAR autotincrement sizes as per ARM ADI spec.
- set TAR size to 12 bits for Cortex-M3.
- Original patch submitted by Magnus Lundin [lu...@ml...].


Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-06-04 13:18:07 UTC (rev 2050)
+++ trunk/src/target/arm_adi_v5.c	2009-06-04 13:45:50 UTC (rev 2051)
@@ -52,6 +52,18 @@
  * are immediatley available.
 */
 
+
+/* ARM ADI Specification requires at least 10 bits used for TAR autoincrement  */
+
+/*
+	u32 tar_block_size(u32 address)
+	Return the largest block starting at address that does not cross a tar block size alignment boundary
+*/
+static u32 max_tar_block_size(u32 tar_autoincr_block, u32 address)
+{
+	return (tar_autoincr_block - ((tar_autoincr_block - 1) & address)) >> 2;
+}
+
 /***************************************************************************
  *                                                                         *
  * DPACC and APACC scanchain access through JTAG-DP                        *
@@ -467,8 +479,8 @@
 
 	while (wcount > 0)
 	{
-		/* Adjust to write blocks within 4K aligned boundaries */
-		blocksize = (0x1000 - (0xFFF & address)) >> 2;
+		/* Adjust to write blocks within boundaries aligned to the TAR autoincremnent size*/
+		blocksize = max_tar_block_size(swjdp->tar_autoincr_block, address);
 		if (wcount < blocksize)
 			blocksize = wcount;
 
@@ -517,8 +529,8 @@
 	{
 		int nbytes;
 
-		/* Adjust to read within 4K block boundaries */
-		blocksize = (0x1000 - (0xFFF & address)) >> 1;
+		/* Adjust to write blocks within boundaries aligned to the TAR autoincremnent size*/
+		blocksize = max_tar_block_size(swjdp->tar_autoincr_block, address);
 
 		if (wcount < blocksize)
 			blocksize = wcount;
@@ -613,8 +625,8 @@
 	{
 		int nbytes;
 
-		/* Adjust to read within 4K block boundaries */
-		blocksize = (0x1000 - (0xFFF & address));
+		/* Adjust to write blocks within boundaries aligned to the TAR autoincremnent size*/
+		blocksize = max_tar_block_size(swjdp->tar_autoincr_block, address);
 
 		if (wcount < blocksize)
 			blocksize = wcount;
@@ -710,8 +722,8 @@
 
 	while (wcount > 0)
 	{
-		/* Adjust to read within 4K block boundaries */
-		blocksize = (0x1000 - (0xFFF & address)) >> 2;
+		/* Adjust to read blocks within boundaries aligned to the TAR autoincremnent size*/
+		blocksize = max_tar_block_size(swjdp->tar_autoincr_block, address);
 		if (wcount < blocksize)
 			blocksize = wcount;
 
@@ -784,8 +796,8 @@
 	{
 		int nbytes;
 
-		/* Adjust to read within 4K block boundaries */
-		blocksize = (0x1000 - (0xFFF & address)) >> 1;
+		/* Adjust to read blocks within boundaries aligned to the TAR autoincremnent size*/
+		blocksize = max_tar_block_size(swjdp->tar_autoincr_block, address);
 		if (wcount < blocksize)
 			blocksize = wcount;
 
@@ -879,8 +891,8 @@
 	{
 		int nbytes;
 
-		/* Adjust to read within 4K block boundaries */
-		blocksize = (0x1000 - (0xFFF & address));
+		/* Adjust to read blocks within boundaries aligned to the TAR autoincremnent size*/
+		blocksize = max_tar_block_size(swjdp->tar_autoincr_block, address);
 
 		if (wcount < blocksize)
 			blocksize = wcount;

Modified: trunk/src/target/arm_adi_v5.h
===================================================================
--- trunk/src/target/arm_adi_v5.h	2009-06-04 13:18:07 UTC (rev 2050)
+++ trunk/src/target/arm_adi_v5.h	2009-06-04 13:45:50 UTC (rev 2051)
@@ -99,8 +99,17 @@
 	u8  ack;
 	/* extra tck clocks for memory bus access */
 	u32	memaccess_tck;
+	/* Size of TAR autoincrement block, ARM ADI Specification requires at least 10 bits */
+	u32 tar_autoincr_block;
+
 } swjdp_common_t;
 
+/* Accessor function for currently selected DAP-AP number */ 
+static inline u8 dap_ap_get_select(swjdp_common_t *swjdp)
+{
+	return (u8)( swjdp ->apsel >> 24);
+}
+
 /* Internal functions used in the module, partial transactions, use with caution */
 extern int dap_dp_write_reg(swjdp_common_t *swjdp, u32 value, u8 reg_addr);
 /* extern int swjdp_write_apacc(swjdp_common_t *swjdp, u32 value, u8 reg_addr); */

Modified: trunk/src/target/cortex_m3.c
===================================================================
--- trunk/src/target/cortex_m3.c	2009-06-04 13:18:07 UTC (rev 2050)
+++ trunk/src/target/cortex_m3.c	2009-06-04 13:45:50 UTC (rev 2051)
@@ -1579,6 +1579,7 @@
 	armv7m->swjdp_info.ap_tar_value = -1;
 	armv7m->swjdp_info.jtag_info = &cortex_m3->jtag_info;
 	armv7m->swjdp_info.memaccess_tck = 8;
+	armv7m->swjdp_info.tar_autoincr_block = (1<<12);	/* Cortex-M3 has 4096 bytes autoincrement range */
 
 	/* initialize arch-specific breakpoint handling */
 

[Openocd-svn] r2050 - in trunk/src: flash jtag pld target xsvf

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 15:18:07 +0200 (Thu, 04 Jun 2009)
New Revision: 2050

Modified:
   trunk/src/flash/str9xpec.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/minidriver.h
   trunk/src/jtag/zy1000.c
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm720t.c
   trunk/src/target/arm7_9_common.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm920t.c
   trunk/src/target/arm926ejs.c
   trunk/src/target/arm966e.c
   trunk/src/target/arm9tdmi.c
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/avrt.c
   trunk/src/target/embeddedice.c
   trunk/src/target/etb.c
   trunk/src/target/etm.c
   trunk/src/target/feroceon.c
   trunk/src/target/mips_ejtag.c
   trunk/src/target/mips_m4k.c
   trunk/src/target/xscale.c
   trunk/src/xsvf/xsvf.c
Log:
Rename jtag_add_end_state to jtag_set_end_state since "add" implies that
this fn has something to do with the queue, which it does not as such.

Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/flash/str9xpec.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -137,7 +137,7 @@
 	field.in_value = &status;
 
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	LOG_DEBUG("status: 0x%2.2x", status);
@@ -225,7 +225,7 @@
 	field.in_value = str9xpec_info->options;
 
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	status = str9xpec_isc_status(tap);
@@ -372,7 +372,7 @@
 	field.out_value = buffer;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 	jtag_add_sleep(40000);
 
 	/* read blank check result */
@@ -478,7 +478,7 @@
 	field.out_value = buffer;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	jtag_add_sleep(10);
@@ -704,7 +704,7 @@
 			field.out_value = (buffer + bytes_written);
 			field.in_value = NULL;
 
-			jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+			jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
 			/* small delay before polling */
 			jtag_add_sleep(50);
@@ -754,7 +754,7 @@
 		field.out_value = last_dword;
 		field.in_value = NULL;
 
-		jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+		jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
 		/* small delay before polling */
 		jtag_add_sleep(50);
@@ -826,7 +826,7 @@
 	field.out_value = NULL;
 	field.in_value = buffer;
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	idcode = buf_get_u32(buffer, 0, 32);
@@ -946,7 +946,7 @@
 	field.out_value = str9xpec_info->options;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
 	/* small delay before polling */
 	jtag_add_sleep(50);

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/jtag/jtag.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -750,7 +750,7 @@
 	if (trst_with_tlr)
 	{
 		LOG_DEBUG("JTAG reset with RESET instead of TRST");
-		jtag_add_end_state(TAP_RESET);
+		jtag_set_end_state(TAP_RESET);
 		jtag_add_tlr();
 		return;
 	}
@@ -771,7 +771,7 @@
 	}
 }
 
-tap_state_t jtag_add_end_state(tap_state_t state)
+tap_state_t jtag_set_end_state(tap_state_t state)
 {
 	if ((state == TAP_DRSHIFT)||(state == TAP_IRSHIFT))
 	{
@@ -2179,7 +2179,7 @@
 			command_print( cmd_ctx, "Invalid state name: %s\n", args[0] );
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
-		jtag_add_end_state(state);
+		jtag_set_end_state(state);
 		jtag_execute_queue();
 	}
 	command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state));

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/jtag/jtag.h	2009-06-04 13:18:07 UTC (rev 2050)
@@ -488,14 +488,14 @@
 
 
 /**
- * Function jtag_add_end_state
+ * Function jtag_set_end_state
  *
  * Set a global variable to \a state if \a state != TAP_INVALID.
  *
  * Return the value of the global variable.
  *
  **/
-extern tap_state_t jtag_add_end_state(tap_state_t state);
+extern tap_state_t jtag_set_end_state(tap_state_t state);
 /**
  * Function jtag_get_end_state
  *

Modified: trunk/src/jtag/minidriver.h
===================================================================
--- trunk/src/jtag/minidriver.h	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/jtag/minidriver.h	2009-06-04 13:18:07 UTC (rev 2050)
@@ -120,7 +120,7 @@
  * approperiate
  */
 extern int interface_jtag_add_reset(int trst, int srst);
-extern int interface_jtag_add_end_state(tap_state_t endstate);
+extern int interface_jtag_set_end_state(tap_state_t endstate);
 extern int interface_jtag_add_sleep(u32 us);
 extern int interface_jtag_add_clocks(int num_cycles);
 extern int interface_jtag_execute_queue(void);

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/jtag/zy1000.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -499,7 +499,7 @@
 	}
 }
 
-int interface_jtag_add_end_state(tap_state_t state)
+int interface_jtag_set_end_state(tap_state_t state)
 {
 	return ERROR_OK;
 }

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/pld/virtex2.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -58,7 +58,7 @@
 
 
 
-		jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_IDLE));
+		jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
 		free(field.out_value);
 	}
@@ -85,7 +85,7 @@
 
 	virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
 
-	jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE));
+	jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
 
 	free(values);
 
@@ -113,7 +113,7 @@
 	{
 		scan_field.in_value = (u8 *)words;
 		
-		jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE));
+		jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
 
 		jtag_add_callback(virtexflip32, (u8 *)words);
 
@@ -165,7 +165,7 @@
 	if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
 		return retval;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */
 	jtag_execute_queue();
 	jtag_add_sleep(1000);
@@ -179,18 +179,18 @@
 	field.num_bits = bit_file.length * 8;
 	field.out_value = bit_file.data;
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+	jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 	jtag_execute_queue();
 
 	jtag_add_tlr();
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
-	jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE));
+	jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE));
 	virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
 	virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
 	virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
-	jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE));
+	jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE));
 	virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
 	jtag_execute_queue();
 

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm11_dbgtap.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -439,7 +439,7 @@
 		{
 			Data	    = *data;
 
-			arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE));
+			arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, jtag_set_end_state(TAP_IDLE));
 
 			CHECK_RETVAL(jtag_execute_queue());
 
@@ -526,13 +526,13 @@
 
 		if (count)
 		{
-			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_DRPAUSE));
+			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_set_end_state(TAP_DRPAUSE));
 			jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
 				arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
 		}
 		else
 		{
-			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE));
+			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_set_end_state(TAP_IDLE));
 		}
 	}
 

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm720t.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -96,7 +96,7 @@
 
 	buf_set_u32(out_buf, 0, 32, flip_u32(out, 32));
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	if((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
 	{
 		return retval;

Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm7_9_common.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -693,7 +693,7 @@
 	reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
 
 	/* set RESTART instruction */
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if (arm7_9->need_bypass_before_restart) {
 		arm7_9->need_bypass_before_restart = 0;
 		arm_jtag_set_instr(jtag_info, 0xf, NULL);
@@ -747,7 +747,7 @@
 	reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
 
 	/* set RESTART instruction */
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if (arm7_9->need_bypass_before_restart) {
 		arm7_9->need_bypass_before_restart = 0;
 		arm_jtag_set_instr(jtag_info, 0xf, NULL);
@@ -1724,14 +1724,14 @@
 	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
 
 	/* set RESTART instruction */
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if (arm7_9->need_bypass_before_restart) {
 		arm7_9->need_bypass_before_restart = 0;
 		arm_jtag_set_instr(jtag_info, 0xf, NULL);
 	}
 	arm_jtag_set_instr(jtag_info, 0x4, NULL);
 
-	jtag_add_runtest(1, jtag_add_end_state(TAP_IDLE));
+	jtag_add_runtest(1, jtag_set_end_state(TAP_IDLE));
 	return jtag_execute_queue();
 }
 

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm7tdmi.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -98,7 +98,7 @@
 		u8 databus[4];
 		u8 breakpoint;
 
-		jtag_add_end_state(TAP_DRPAUSE);
+		jtag_set_end_state(TAP_DRPAUSE);
 
 		fields[0].tap = arm7_9->jtag_info.tap;
 		fields[0].num_bits = 1;
@@ -116,7 +116,7 @@
 		}
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
+		jtag_add_dr_scan(2, fields, jtag_set_end_state(TAP_DRPAUSE));
 		if((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;
@@ -127,7 +127,7 @@
 		fields[1].in_value = NULL;
 		fields[1].out_value = databus;
 
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
+		jtag_add_dr_scan(2, fields, jtag_set_end_state(TAP_DRPAUSE));
 
 		if (breakpoint & 1)
 			target->debug_reason = DBG_REASON_WATCHPOINT;
@@ -157,7 +157,7 @@
 /* put an instruction in the ARM7TDMI pipeline or write the data bus, and optionally read data */
 static __inline int arm7tdmi_clock_out(arm_jtag_t *jtag_info, u32 out, u32 *deprecated, int breakpoint)
 {
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	arm_jtag_scann(jtag_info, 0x1);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -170,7 +170,7 @@
 	int retval = ERROR_OK;
 	scan_field_t fields[2];
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
 	{
 		return retval;
@@ -260,7 +260,7 @@
 	int retval = ERROR_OK;
 	scan_field_t fields[2];
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
 	{
 		return retval;

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm920t.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -103,7 +103,7 @@
 	u8 reg_addr_buf = reg_addr & 0x3f;
 	u8 nr_w_buf = 0;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0xf);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -156,7 +156,7 @@
 
 	buf_set_u32(value_buf, 0, 32, value);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0xf);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -201,7 +201,7 @@
 	u8 nr_w_buf = 0;
 	u8 cp15_opcode_buf[4];
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0xf);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm926ejs.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -129,7 +129,7 @@
 
 	buf_set_u32(address_buf, 0, 14, address);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
 	{
 		return retval;
@@ -200,7 +200,7 @@
 	buf_set_u32(address_buf, 0, 14, address);
 	buf_set_u32(value_buf, 0, 32, value);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
 	{
 		return retval;

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm966e.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -167,7 +167,7 @@
 	u8 reg_addr_buf = reg_addr & 0x3f;
 	u8 nr_w_buf = 0;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
 	{
 		return retval;
@@ -222,7 +222,7 @@
 
 	buf_set_u32(value_buf, 0, 32, value);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
 	{
 		return retval;

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm9tdmi.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -111,7 +111,7 @@
 		u8 instructionbus[4];
 		u8 debug_reason;
 
-		jtag_add_end_state(TAP_DRPAUSE);
+		jtag_set_end_state(TAP_DRPAUSE);
 
 		fields[0].tap = arm7_9->jtag_info.tap;
 		fields[0].num_bits = 32;
@@ -134,7 +134,7 @@
 		}
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE));
+		jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_DRPAUSE));
 		if ((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;
@@ -147,7 +147,7 @@
 		fields[2].in_value = NULL;
 		fields[2].out_value = instructionbus;
 
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE));
+		jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_DRPAUSE));
 
 		if (debug_reason & 0x4)
 			if (debug_reason & 0x2)
@@ -178,7 +178,7 @@
 	if (sysspeed)
 		buf_set_u32(&sysspeed_buf, 2, 1, 1);
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
 	{
 		return retval;
@@ -240,7 +240,7 @@
 	int retval = ERROR_OK;;
 	scan_field_t fields[3];
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
 	{
 		return retval;
@@ -307,7 +307,7 @@
 	int retval = ERROR_OK;
 	scan_field_t fields[3];
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
 	{
 		return retval;

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/arm_adi_v5.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -65,12 +65,12 @@
 	scan_field_t fields[2];
 	u8 out_addr_buf;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_set_instr(jtag_info, instr, NULL);
 
 	/* Add specified number of tck clocks before accessing memory bus */
 	if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
-		jtag_add_runtest(swjdp->memaccess_tck, jtag_add_end_state(TAP_IDLE));
+		jtag_add_runtest(swjdp->memaccess_tck, jtag_set_end_state(TAP_IDLE));
 
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 3;
@@ -96,12 +96,12 @@
 	u8 out_value_buf[4];
 	u8 out_addr_buf;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_set_instr(jtag_info, instr, NULL);
 
 	/* Add specified number of tck clocks before accessing memory bus */
 	if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
-		jtag_add_runtest(swjdp->memaccess_tck, jtag_add_end_state(TAP_IDLE));
+		jtag_add_runtest(swjdp->memaccess_tck, jtag_set_end_state(TAP_IDLE));
 
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 3;

Modified: trunk/src/target/avrt.c
===================================================================
--- trunk/src/target/avrt.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/avrt.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -218,7 +218,7 @@
 		field[0].num_bits = tap->ir_length;
 		field[0].out_value = ir_out;
 		field[0].in_value = ir_in;
-		jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, jtag_add_end_state(TAP_IDLE));
+		jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, jtag_set_end_state(TAP_IDLE));
 	}
 
 	return ERROR_OK;
@@ -239,7 +239,7 @@
 		field[0].num_bits = dr_len;
 		field[0].out_value = dr_out;
 		field[0].in_value = dr_in;
-		jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, jtag_add_end_state(TAP_IDLE));
+		jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, jtag_set_end_state(TAP_IDLE));
 	}
 
 	return ERROR_OK;

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/embeddedice.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -238,7 +238,7 @@
 	u8 field1_out[1];
 	u8 field2_out[1];
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(ice_reg->jtag_info, 0x2);
 
 	arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL);
@@ -293,7 +293,7 @@
 	u8 field1_out[1];
 	u8 field2_out[1];
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0x2);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -369,7 +369,7 @@
 
 	LOG_DEBUG("%i: 0x%8.8x", ice_reg->addr, value);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(ice_reg->jtag_info, 0x2);
 
 	arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL);
@@ -395,7 +395,7 @@
 	u8 field1_out[1];
 	u8 field2_out[1];
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0x2);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -450,7 +450,7 @@
 	else
 		return ERROR_INVALID_ARGUMENTS;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0x2);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/etb.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -169,7 +169,7 @@
 	scan_field_t fields[3];
 	int i;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	etb_scann(etb, 0x0);
 	etb_set_instr(etb, 0xc);
 
@@ -225,7 +225,7 @@
 
 	LOG_DEBUG("%i", etb_reg->addr);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	etb_scann(etb_reg->etb, 0x0);
 	etb_set_instr(etb_reg->etb, 0xc);
 
@@ -314,7 +314,7 @@
 
 	LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	etb_scann(etb_reg->etb, 0x0);
 	etb_set_instr(etb_reg->etb, 0xc);
 

Modified: trunk/src/target/etm.c
===================================================================
--- trunk/src/target/etm.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/etm.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -320,7 +320,7 @@
 
 	LOG_DEBUG("%i", etm_reg->addr);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(etm_reg->jtag_info, 0x6);
 	arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL);
 
@@ -405,7 +405,7 @@
 
 	LOG_DEBUG("%i: 0x%8.8x", etm_reg->addr, value);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(etm_reg->jtag_info, 0x6);
 	arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL);
 

Modified: trunk/src/target/feroceon.c
===================================================================
--- trunk/src/target/feroceon.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/feroceon.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -124,7 +124,7 @@
 
 	buf_set_u32(instr_buf, 0, 32, flip_u32(instr, 32));
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	arm_jtag_scann(jtag_info, 0x1);
 
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);

Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/mips_ejtag.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -60,7 +60,7 @@
 {
 	scan_field_t field;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 
 	mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IDCODE, NULL);
 
@@ -87,7 +87,7 @@
 {
 	scan_field_t field;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 
 	mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE, NULL);
 
@@ -199,7 +199,7 @@
 int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
 {
 	u32 ejtag_ctrl;
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
 
 	/* set debug break bit */

Modified: trunk/src/target/mips_m4k.c
===================================================================
--- trunk/src/target/mips_m4k.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/mips_m4k.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -161,7 +161,7 @@
 	u32 ejtag_ctrl = ejtag_info->ejtag_ctrl;
 
 	/* read ejtag control reg */
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
 	mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
@@ -171,7 +171,7 @@
 	{
 		/* we have detected a reset, clear flag
 		 * otherwise ejtag will not work */
-		jtag_add_end_state(TAP_IDLE);
+		jtag_set_end_state(TAP_IDLE);
 		ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_ROCC;
 
 		mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
@@ -184,7 +184,7 @@
 	{
 		if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
 		{
-			jtag_add_end_state(TAP_IDLE);
+			jtag_set_end_state(TAP_IDLE);
 			mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL);
 
 			target->state = TARGET_HALTED;
@@ -276,12 +276,12 @@
 	if (target->reset_halt)
 	{
 		/* use hardware to catch reset */
-		jtag_add_end_state(TAP_IDLE);
+		jtag_set_end_state(TAP_IDLE);
 		mips_ejtag_set_instr(ejtag_info, EJTAG_INST_EJTAGBOOT, NULL);
 	}
 	else
 	{
-		jtag_add_end_state(TAP_IDLE);
+		jtag_set_end_state(TAP_IDLE);
 		mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL);
 	}
 

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/target/xscale.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -238,7 +238,7 @@
 	u8 field2_check_value = 0x0;
 	u8 field2_check_mask = 0x1;
 
-	jtag_add_end_state(TAP_DRPAUSE);
+	jtag_set_end_state(TAP_DRPAUSE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr);
 
 	buf_set_u32(&field0, 1, 1, xscale->hold_rst);
@@ -283,7 +283,7 @@
 	fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
 	fields[1].in_value = NULL;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 
 	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
@@ -345,7 +345,7 @@
 	fields[2].check_value = &field2_check_value;
 	fields[2].check_mask = &field2_check_mask;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
 	jtag_add_runtest(1, jtag_get_end_state()); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */
 
@@ -363,7 +363,7 @@
 
 			fields[1].in_value = (u8 *)(field1+i);
 
-			jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_IDLE));
+			jtag_add_dr_scan_check(3, fields, jtag_set_end_state(TAP_IDLE));
 
 			jtag_add_callback(xscale_getbuf, (u8 *)(field1+i));
 
@@ -429,7 +429,7 @@
 	u8 field2_check_value = 0x0;
 	u8 field2_check_mask = 0x1;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
 
@@ -477,7 +477,7 @@
 			jtag_add_pathmove(sizeof(noconsume_path)/sizeof(*noconsume_path), noconsume_path);
 		}
 
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE));
+		jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
 
 		jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
 		jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@@ -532,7 +532,7 @@
 	u8 field2_check_value = 0x0;
 	u8 field2_check_mask = 0x1;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgrx);
 
@@ -560,7 +560,7 @@
 	LOG_DEBUG("polling RX");
 	for (;;)
 	{
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE));
+		jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
 
 		jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
 		jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@@ -592,7 +592,7 @@
 
 	/* set rx_valid */
 	field2 = 0x1;
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE));
+	jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
 
 	if ((retval = jtag_execute_queue()) != ERROR_OK)
 	{
@@ -615,7 +615,7 @@
 
 	int done_count = 0;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgrx);
 
@@ -658,7 +658,7 @@
 				3,
 				bits,
 				t,
-				jtag_add_end_state(TAP_IDLE));
+				jtag_set_end_state(TAP_IDLE));
 		buffer += size;
 	}
 
@@ -701,7 +701,7 @@
 	if (ext_dbg_brk != -1)
 		xscale->external_debug_break = ext_dbg_brk;
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr);
 
 	buf_set_u32(&field0, 1, 1, xscale->hold_rst);
@@ -766,7 +766,7 @@
 
 	LOG_DEBUG("loading miniIC at 0x%8.8x", va);
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.ldic); /* LDIC */
 
 	/* CMD is b010 for Main IC and b011 for Mini IC */
@@ -833,7 +833,7 @@
 
 	scan_field_t fields[2];
 
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.ldic); /* LDIC */
 
 	/* CMD for invalidate IC line b000, bits [6:4] b000 */
@@ -1572,7 +1572,7 @@
 	/* select DCSR instruction (set endstate to R-T-I to ensure we don't
 	 * end up in T-L-R, which would reset JTAG
 	 */
-	jtag_add_end_state(TAP_IDLE);
+	jtag_set_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dcsr);
 
 	/* set Hold reset, Halt mode and Trap Reset */
@@ -1646,7 +1646,7 @@
 		/* wait 300ms; 150 and 100ms were not enough */
 		jtag_add_sleep(300*1000);
 
-		jtag_add_runtest(2030, jtag_add_end_state(TAP_IDLE));
+		jtag_add_runtest(2030, jtag_set_end_state(TAP_IDLE));
 		jtag_execute_queue();
 
 		/* set Hold reset, Halt mode and Trap Reset */
@@ -1709,7 +1709,7 @@
 		xscale_load_ic(target, 1, 0x0, xscale->low_vectors);
 		xscale_load_ic(target, 1, 0xffff0000, xscale->high_vectors);
 
-		jtag_add_runtest(30, jtag_add_end_state(TAP_IDLE));
+		jtag_add_runtest(30, jtag_set_end_state(TAP_IDLE));
 
 		jtag_add_sleep(100000);
 

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-06-04 13:14:07 UTC (rev 2049)
+++ trunk/src/xsvf/xsvf.c	2009-06-04 13:18:07 UTC (rev 2050)
@@ -405,9 +405,9 @@
 					field.in_value = calloc(CEIL(field.num_bits, 8), 1);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+						jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 
@@ -853,9 +853,9 @@
 						LOG_USER("LSDR retry %d", attempt);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+						jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 

[Openocd-svn] r2049 - in trunk/src: flash jtag target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 15:14:07 +0200 (Thu, 04 Jun 2009)
New Revision: 2049

Modified:
   trunk/src/flash/str9xpec.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/zy1000.c
   trunk/src/target/arm11.h
   trunk/src/target/arm720t.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm920t.c
   trunk/src/target/arm926ejs.c
   trunk/src/target/arm966e.c
   trunk/src/target/arm9tdmi.c
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/arm_jtag.c
   trunk/src/target/embeddedice.c
   trunk/src/target/embeddedice.h
   trunk/src/target/etb.c
   trunk/src/target/etm.c
   trunk/src/target/feroceon.c
   trunk/src/target/mips_ejtag.c
   trunk/src/target/xscale.c
Log:
Introduce jtag_get_end_state() fn to clarify code a bit.

Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/flash/str9xpec.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -539,7 +539,7 @@
 		field.out_value = NULL;
 		field.in_value = &status;
 
-		jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(1, &field, jtag_get_end_state());
 		jtag_execute_queue();
 
 	} while(!(status & ISC_STATUS_BUSY));
@@ -620,7 +620,7 @@
 	field.out_value = &sector;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
 	return ERROR_OK;
 }
@@ -717,7 +717,7 @@
 				field.out_value = NULL;
 				field.in_value = scanbuf;
 
-				jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+				jtag_add_dr_scan(1, &field, jtag_get_end_state());
 				jtag_execute_queue();
 
 				status = buf_get_u32(scanbuf, 0, 8);
@@ -767,7 +767,7 @@
 			field.out_value = NULL;
 			field.in_value = scanbuf;
 
-			jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+			jtag_add_dr_scan(1, &field, jtag_get_end_state());
 			jtag_execute_queue();
 
 			status = buf_get_u32(scanbuf, 0, 8);
@@ -959,7 +959,7 @@
 		field.out_value = NULL;
 		field.in_value = &status;
 
-		jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(1, &field, jtag_get_end_state());
 		jtag_execute_queue();
 
 	} while(!(status & ISC_STATUS_BUSY));

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/jtag/jtag.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -783,6 +783,11 @@
 	return cmd_queue_end_state;
 }
 
+tap_state_t jtag_get_end_state(void)
+{
+	return cmd_queue_end_state;
+}
+
 void jtag_add_sleep(u32 us)
 {
 	keep_alive(); /* we might be running on a very slow JTAG clk */
@@ -2226,7 +2231,7 @@
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	jtag_add_runtest(strtol(args[0], NULL, 0), jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(strtol(args[0], NULL, 0), jtag_get_end_state());
 	jtag_execute_queue();
 
 	return ERROR_OK;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/jtag/jtag.h	2009-06-04 13:14:07 UTC (rev 2049)
@@ -488,7 +488,7 @@
 
 
 /**
- * Function jtag_add_stable_clocks
+ * Function jtag_add_end_state
  *
  * Set a global variable to \a state if \a state != TAP_INVALID.
  *
@@ -496,6 +496,13 @@
  *
  **/
 extern tap_state_t jtag_add_end_state(tap_state_t state);
+/**
+ * Function jtag_get_end_state
+ *
+ * Return the value of the global variable for end state
+ *
+ **/
+extern tap_state_t jtag_get_end_state(void);
 extern void jtag_add_sleep(u32 us);
 
 

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/jtag/zy1000.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -748,7 +748,7 @@
 void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
 {
 //	static int const reg_addr=0x5;
-	tap_state_t end_state=jtag_add_end_state(TAP_INVALID);
+	tap_state_t end_state=jtag_get_end_state();
 	if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL)
 	{
 		/* better performance via code duplication */

Modified: trunk/src/target/arm11.h
===================================================================
--- trunk/src/target/arm11.h	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm11.h	2009-06-04 13:14:07 UTC (rev 2049)
@@ -47,7 +47,7 @@
 					 23 * ARM11_REGCACHE_MODEREGS +			\
 					  9 * ARM11_REGCACHE_FREGS)
 
-#define ARM11_TAP_DEFAULT			jtag_add_end_state(TAP_INVALID)
+#define ARM11_TAP_DEFAULT			jtag_get_end_state()
 
 
 #define CHECK_RETVAL(action)								\

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm720t.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -119,15 +119,15 @@
 	if (in)
 	{
 		fields[1].in_value = (u8 *)in;
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(2, fields, jtag_get_end_state());
 		jtag_add_callback(arm7flip32, (u8 *)in);
 	} else
 	{
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(2, fields, jtag_get_end_state());
 	}
 
 	if (clock)
-		jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+		jtag_add_runtest(0, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	if((retval = jtag_execute_queue()) != ERROR_OK)

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm7tdmi.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -147,9 +147,9 @@
 			2,
 			arm7tdmi_num_bits,
 			values,
-			jtag_add_end_state(TAP_INVALID));
+			jtag_get_end_state());
 
-	jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(0, jtag_get_end_state());
 
 	return ERROR_OK;
 }
@@ -187,11 +187,11 @@
 	fields[1].out_value = NULL;
 	fields[1].in_value = (u8 *)in;
 
-	jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(2, fields, jtag_get_end_state());
 
 	jtag_add_callback(arm7flip32, (u8 *)in);
 
-	jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(0, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {
@@ -277,11 +277,11 @@
 	fields[1].out_value = NULL;
 	jtag_alloc_in_value32(&fields[1]);
 
-	jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(2, fields, jtag_get_end_state());
 
 	jtag_add_callback4(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)fields[1].in_value);
 
-	jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(0, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm920t.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -127,11 +127,11 @@
 	fields[3].out_value = &nr_w_buf;
 	fields[3].in_value = NULL;
 
-	jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 	fields[1].in_value = (u8 *)value;
 
-	jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 	jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
@@ -180,7 +180,7 @@
 	fields[3].out_value = &nr_w_buf;
 	fields[3].in_value = NULL;
 
-	jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	LOG_DEBUG("addr: 0x%x value: %8.8x", reg_addr, value);
@@ -227,7 +227,7 @@
 	fields[3].out_value = &nr_w_buf;
 	fields[3].in_value = NULL;
 
-	jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 	arm9tdmi_clock_out(jtag_info, arm_opcode, 0, NULL, 0);
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 1);

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm926ejs.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -157,7 +157,7 @@
 	fields[3].out_value = &nr_w_buf;
 	fields[3].in_value = NULL;
 
-	jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 	/*TODO: add timeout*/
 	do
@@ -165,7 +165,7 @@
 		/* rescan with NOP, to wait for the access to complete */
 		access = 0;
 		nr_w_buf = 0;
-		jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 		jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
@@ -227,14 +227,14 @@
 	fields[3].out_value = &nr_w_buf;
 	fields[3].in_value = NULL;
 
-	jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(4, fields, jtag_get_end_state());
 	/*TODO: add timeout*/
 	do
 	{
 		/* rescan with NOP, to wait for the access to complete */
 		access = 0;
 		nr_w_buf = 0;
-		jtag_add_dr_scan(4, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(4, fields, jtag_get_end_state());
 		if ((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm966e.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -189,11 +189,11 @@
 	fields[2].out_value = &nr_w_buf;
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	fields[1].in_value = (u8 *)value;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
@@ -244,7 +244,7 @@
 	fields[2].out_value = &nr_w_buf;
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	LOG_DEBUG("addr: 0x%x value: %8.8x", reg_addr, value);

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm9tdmi.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -204,16 +204,16 @@
 	if (in)
 	{
 		fields[0].in_value=(u8 *)in;
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 		jtag_add_callback(arm_le_to_h_u32, (u8 *)in);
 	}
 	else
 	{
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(3, fields, jtag_get_end_state());
 	}
 
-	jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(0, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	{
@@ -263,11 +263,11 @@
 	fields[2].out_value = NULL;
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	jtag_add_callback(arm_le_to_h_u32, (u8 *)in);
 
-	jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(0, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	{
@@ -330,11 +330,11 @@
 	fields[2].out_value = NULL;
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	jtag_add_callback4(arm9endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)fields[0].in_value);
 
-	jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
+	jtag_add_runtest(0, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	{

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm_adi_v5.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -83,7 +83,7 @@
 	fields[1].out_value = outvalue;
 	fields[1].in_value = invalue;
 
-	jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(2, fields, jtag_get_end_state());
 
 	return ERROR_OK;
 }
@@ -118,13 +118,13 @@
 	if (invalue)
 	{
 		fields[1].in_value = (u8 *)invalue;
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(2, fields, jtag_get_end_state());
 
 		jtag_add_callback(arm_le_to_h_u32, (u8 *)invalue);
 	} else
 	{
 
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(2, fields, jtag_get_end_state());
 	}
 
 	return ERROR_OK;

Modified: trunk/src/target/arm_jtag.c
===================================================================
--- trunk/src/target/arm_jtag.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/arm_jtag.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -53,13 +53,13 @@
 
 		if (no_verify_capture==NULL)
 		{
-			jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+			jtag_add_ir_scan(1, &field, jtag_get_end_state());
 		} else
 		{
 			/* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
 			 * have special verification code.
 			 */
-			jtag_add_ir_scan_noverify(1, &field, jtag_add_end_state(TAP_INVALID));
+			jtag_add_ir_scan_noverify(1, &field, jtag_get_end_state());
 		}
 	}
 
@@ -86,7 +86,7 @@
 				1,
 				num_bits,
 				values,
-				jtag_add_end_state(TAP_INVALID));
+				jtag_get_end_state());
 
 		jtag_info->cur_scan_chain = new_scan_chain;
 	}

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/embeddedice.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -266,7 +266,7 @@
 	fields[2].check_value = NULL;
 	fields[2].check_mask = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	fields[0].in_value = reg->value;
 	fields[0].check_value = check_value;
@@ -278,7 +278,7 @@
 	 */
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 
-	jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan_check(3, fields, jtag_get_end_state());
 
 	return ERROR_OK;
 }
@@ -314,7 +314,7 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	while (size > 0)
 	{
@@ -325,7 +325,7 @@
 			buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 
 		fields[0].in_value = (u8 *)data;
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(3, fields, jtag_get_end_state());
 		jtag_add_callback(arm_le_to_h_u32, (u8 *)data);
 
 		data++;
@@ -420,7 +420,7 @@
 	while (size > 0)
 	{
 		buf_set_u32(fields[0].out_value, 0, 32, *data);
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 		data++;
 		size--;
@@ -471,11 +471,11 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 	gettimeofday(&lap, NULL);
 	do
 	{
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(3, fields, jtag_get_end_state());
 		if ((retval = jtag_execute_queue()) != ERROR_OK)
 			return retval;
 

Modified: trunk/src/target/embeddedice.h
===================================================================
--- trunk/src/target/embeddedice.h	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/embeddedice.h	2009-06-04 13:14:07 UTC (rev 2049)
@@ -121,7 +121,7 @@
 			3,
 			embeddedice_num_bits,
 			values,
-			jtag_add_end_state(TAP_INVALID));
+			jtag_get_end_state());
 }
 
 void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count);

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/etb.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -63,7 +63,7 @@
 
 		field.in_value = NULL;
 
-		jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+		jtag_add_ir_scan(1, &field, jtag_get_end_state());
 
 		free(field.out_value);
 	}
@@ -86,7 +86,7 @@
 
 		/* select INTEST instruction */
 		etb_set_instr(etb, 0x2);
-		jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
 		etb->cur_scan_chain = new_scan_chain;
 
@@ -190,7 +190,7 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	for (i = 0; i < num_frames; i++)
 	{
@@ -204,7 +204,7 @@
 			buf_set_u32(fields[1].out_value, 0, 7, 0);
 
 		fields[0].in_value = (u8 *)(data+i);
-		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 		jtag_add_callback(etb_getbuf, (u8 *)(data+i));
 	}
@@ -252,7 +252,7 @@
 	fields[2].check_value = NULL;
 	fields[2].check_mask = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	/* read the identification register in the second run, to make sure we
 	 * don't read the ETB data register twice, skipping every second entry
@@ -262,7 +262,7 @@
 	fields[0].check_value = check_value;
 	fields[0].check_mask = check_mask;
 
-	jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan_check(3, fields, jtag_get_end_state());
 
 	free(fields[1].out_value);
 	free(fields[2].out_value);

Modified: trunk/src/target/etm.c
===================================================================
--- trunk/src/target/etm.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/etm.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -347,13 +347,13 @@
 	fields[2].check_value = NULL;
 	fields[2].check_mask = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	fields[0].in_value = reg->value;
 	fields[0].check_value = check_value;
 	fields[0].check_mask = check_mask;
 
-	jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan_check(3, fields, jtag_get_end_state());
 
 	free(fields[1].out_value);
 	free(fields[2].out_value);
@@ -430,7 +430,7 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	return ERROR_OK;
 }

Modified: trunk/src/target/feroceon.c
===================================================================
--- trunk/src/target/feroceon.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/feroceon.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -159,9 +159,9 @@
 	
 	
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
-	/* no jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID)) here */
+	/* no jtag_add_runtest(0, jtag_get_end_state()) here */
 
 	return ERROR_OK;
 }

Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/mips_ejtag.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -50,7 +50,7 @@
 		
 		
 		
-		jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+		jtag_add_ir_scan(1, &field, jtag_get_end_state());
 	}
 
 	return ERROR_OK;
@@ -73,7 +73,7 @@
 	
 	
 	
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
 	if (jtag_execute_queue() != ERROR_OK)
 	{
@@ -100,7 +100,7 @@
 	
 	
 	
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
 	if (jtag_execute_queue() != ERROR_OK)
 	{
@@ -131,7 +131,7 @@
 	
 	
 	
-	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
 	if ((retval = jtag_execute_queue()) != ERROR_OK)
 	{

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-06-04 13:05:57 UTC (rev 2048)
+++ trunk/src/target/xscale.c	2009-06-04 13:14:07 UTC (rev 2049)
@@ -212,7 +212,7 @@
 		u8 tmp[4];
 		field.in_value = tmp;
 
-		jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+		jtag_add_ir_scan(1, &field, jtag_get_end_state());
 
 		/* FIX!!!! isn't this check superfluous? verify_ircapture handles this? */
 		jtag_check_value_mask(&field, tap->expected, tap->expected_mask);
@@ -262,7 +262,7 @@
 	u8 tmp2;
 	fields[2].in_value = &tmp2;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
 	jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@@ -285,7 +285,7 @@
 
 	jtag_add_end_state(TAP_IDLE);
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	/* DANGER!!! this must be here. It will make sure that the arguments
 	 * to jtag_set_check_value() does not go out of scope! */
@@ -347,7 +347,7 @@
 
 	jtag_add_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
-	jtag_add_runtest(1, jtag_add_end_state(TAP_INVALID)); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */
+	jtag_add_runtest(1, jtag_get_end_state()); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */
 
 	/* repeat until all words have been collected */
 	int attempts=0;
@@ -725,7 +725,7 @@
 	u8 tmp2;
 	fields[2].in_value = &tmp2;
 
-	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
 	jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
 	jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@@ -800,7 +800,7 @@
 
 
 
-	jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(2, fields, jtag_get_end_state());
 
 	fields[0].num_bits = 32;
 	fields[0].out_value = packet;
@@ -816,7 +816,7 @@
 		memcpy(&value, packet, sizeof(u32));
 		cmd = parity(value);
 
-		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+		jtag_add_dr_scan(2, fields, jtag_get_end_state());
 	}
 
 	jtag_execute_queue();
@@ -862,7 +862,7 @@
 
 
 
-	jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
+	jtag_add_dr_scan(2, fields, jtag_get_end_state());
 
 	return ERROR_OK;
 }

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

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 15:05:57 +0200 (Thu, 04 Jun 2009)
New Revision: 2048

Modified:
   trunk/src/jtag/jtag.h
   trunk/src/jtag/zy1000.c
Log:
tiny bit of encapsulation of global end state. No longer expose it as a global variable.

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 12:52:54 UTC (rev 2047)
+++ trunk/src/jtag/jtag.h	2009-06-04 13:05:57 UTC (rev 2048)
@@ -104,8 +104,6 @@
 
 /// The current TAP state of the pending JTAG command queue.
 extern tap_state_t cmd_queue_cur_state;
-/// The TAP state in which DR scans should end.
-extern tap_state_t cmd_queue_end_state;
 
 /**
  * This structure defines a single scan field in the scan. It provides

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-04 12:52:54 UTC (rev 2047)
+++ trunk/src/jtag/zy1000.c	2009-06-04 13:05:57 UTC (rev 2048)
@@ -748,7 +748,7 @@
 void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
 {
 //	static int const reg_addr=0x5;
-	tap_state_t end_state=cmd_queue_end_state;
+	tap_state_t end_state=jtag_add_end_state(TAP_INVALID);
 	if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL)
 	{
 		/* better performance via code duplication */

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

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 14:52:54 +0200 (Thu, 04 Jun 2009)
New Revision: 2047

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/zy1000.c
Log:
do not modify global end state from jtag_add_xxx()

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 12:42:21 UTC (rev 2046)
+++ trunk/src/jtag/jtag.c	2009-06-04 12:52:54 UTC (rev 2047)
@@ -396,9 +396,7 @@
 
 	assert(state!=TAP_INVALID);
 
-	jtag_add_end_state(state);
-
-	cmd_queue_cur_state = cmd_queue_end_state;
+	cmd_queue_cur_state = state;
 }
 
 void jtag_alloc_in_value32(scan_field_t *field)
@@ -411,7 +409,7 @@
 	int retval;
 	jtag_prelude(state);
 
-	retval=interface_jtag_add_ir_scan(in_num_fields, in_fields, cmd_queue_end_state);
+	retval=interface_jtag_add_ir_scan(in_num_fields, in_fields, state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 
@@ -460,7 +458,7 @@
 
 	jtag_prelude(state);
 
-	retval=interface_jtag_add_plain_ir_scan(in_num_fields, in_fields, cmd_queue_end_state);
+	retval=interface_jtag_add_plain_ir_scan(in_num_fields, in_fields, state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -548,7 +546,7 @@
 
 	jtag_prelude(state);
 
-	retval=interface_jtag_add_dr_scan(in_num_fields, in_fields, cmd_queue_end_state);
+	retval=interface_jtag_add_dr_scan(in_num_fields, in_fields, state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -567,7 +565,7 @@
 
 	jtag_prelude(state);
 
-	retval=interface_jtag_add_plain_dr_scan(in_num_fields, in_fields, cmd_queue_end_state);
+	retval=interface_jtag_add_plain_dr_scan(in_num_fields, in_fields, state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -578,13 +576,11 @@
 {
 	assert(end_state != TAP_INVALID);
 
-	cmd_queue_end_state = end_state;
+	cmd_queue_cur_state = end_state;
 
-	cmd_queue_cur_state = cmd_queue_end_state;
-
 	interface_jtag_add_dr_out(tap,
 			num_fields, num_bits, value,
-			cmd_queue_end_state);
+			end_state);
 }
 
 void jtag_add_tlr(void)
@@ -644,7 +640,7 @@
 	jtag_prelude(state);
 
 	/* executed by sw or hw fifo */
-	retval=interface_jtag_add_runtest(num_cycles, cmd_queue_end_state);
+	retval=interface_jtag_add_runtest(num_cycles, state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-04 12:42:21 UTC (rev 2046)
+++ trunk/src/jtag/zy1000.c	2009-06-04 12:52:54 UTC (rev 2047)
@@ -517,7 +517,7 @@
 		tap_state_t end_state;
 		if (nextTap==NULL)
 		{
-			end_state = cmd_queue_end_state;
+			end_state = state;
 		} else
 		{
 			end_state = TAP_IRSHIFT;
@@ -568,7 +568,7 @@
 
 int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
-	scanFields(num_fields, fields, TAP_IRSHIFT, cmd_queue_end_state);
+	scanFields(num_fields, fields, TAP_IRSHIFT, state);
 
 	return ERROR_OK;
 }
@@ -587,7 +587,7 @@
 		tap_state_t end_state;
 		if (nextTap==NULL)
 		{
-			end_state = cmd_queue_end_state;
+			end_state = state;
 		} else
 		{
 			end_state = TAP_DRSHIFT;
@@ -621,7 +621,7 @@
 
 int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
-	scanFields(num_fields, fields, TAP_DRSHIFT, cmd_queue_end_state);
+	scanFields(num_fields, fields, TAP_DRSHIFT, state);
 	return ERROR_OK;
 }
 
@@ -693,7 +693,7 @@
 
 int interface_jtag_add_clocks(int num_cycles)
 {
-	return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_end_state);
+	return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
 }
 
 int interface_jtag_add_sleep(u32 us)

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

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 14:42:21 +0200 (Thu, 04 Jun 2009)
New Revision: 2046

Modified:
   trunk/src/jtag/zy1000.c
Log:
remove unused code.

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-04 12:12:38 UTC (rev 2045)
+++ trunk/src/jtag/zy1000.c	2009-06-04 12:42:21 UTC (rev 2046)
@@ -427,11 +427,6 @@
 
 extern int jtag_check_value(u8 *captured, void *priv);
 
-static void gotoEndState(void)
-{
-	setCurrentState(cmd_queue_end_state);
-}
-
 static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
 {
 	int i;

[Openocd-svn] r2045 - in trunk/src: pld target xsvf

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 14:12:38 +0200 (Thu, 04 Jun 2009)
New Revision: 2045

Modified:
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm9tdmi.c
   trunk/src/xsvf/xsvf.c
Log:
no longer use jtag_add_xxx() to set end state to TAP_DRPAUSE

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/pld/virtex2.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -85,7 +85,7 @@
 
 	virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
 
-	jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE);
+	jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE));
 
 	free(values);
 
@@ -113,7 +113,7 @@
 	{
 		scan_field.in_value = (u8 *)words;
 		
-		jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE);
+		jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE));
 
 		jtag_add_callback(virtexflip32, (u8 *)words);
 
@@ -179,7 +179,7 @@
 	field.num_bits = bit_file.length * 8;
 	field.out_value = bit_file.data;
 
-	jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 	jtag_execute_queue();
 
 	jtag_add_tlr();

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/target/arm11_dbgtap.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -526,7 +526,7 @@
 
 		if (count)
 		{
-			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
+			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_DRPAUSE));
 			jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
 				arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
 		}

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/target/arm7tdmi.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -116,7 +116,7 @@
 		}
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(2, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
 		if((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;
@@ -127,7 +127,7 @@
 		fields[1].in_value = NULL;
 		fields[1].out_value = databus;
 
-		jtag_add_dr_scan(2, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
 
 		if (breakpoint & 1)
 			target->debug_reason = DBG_REASON_WATCHPOINT;

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/target/arm9tdmi.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -134,7 +134,7 @@
 		}
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(3, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE));
 		if ((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;
@@ -147,7 +147,7 @@
 		fields[2].in_value = NULL;
 		fields[2].out_value = instructionbus;
 
-		jtag_add_dr_scan(3, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE));
 
 		if (debug_reason & 0x4)
 			if (debug_reason & 0x2)

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/xsvf/xsvf.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -405,9 +405,9 @@
 					field.in_value = calloc(CEIL(field.num_bits, 8), 1);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 
@@ -853,9 +853,9 @@
 						LOG_USER("LSDR retry %d", attempt);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 

[Openocd-svn] r2044 - in trunk/src: flash pld target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 14:06:31 +0200 (Thu, 04 Jun 2009)
New Revision: 2044

Modified:
   trunk/src/flash/str9xpec.c
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm7_9_common.c
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/avrt.c
   trunk/src/target/xscale.c
Log:
no longer use jtag_add_xxx() to set end state to TAP_IDLE. Same must be done for TAP_DRPAUSE

Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/flash/str9xpec.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -137,7 +137,7 @@
 	field.in_value = &status;
 
 
-	jtag_add_dr_scan(1, &field, TAP_IDLE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	LOG_DEBUG("status: 0x%2.2x", status);
@@ -225,7 +225,7 @@
 	field.in_value = str9xpec_info->options;
 
 
-	jtag_add_dr_scan(1, &field, TAP_IDLE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	status = str9xpec_isc_status(tap);
@@ -372,7 +372,7 @@
 	field.out_value = buffer;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, TAP_IDLE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 	jtag_add_sleep(40000);
 
 	/* read blank check result */
@@ -478,7 +478,7 @@
 	field.out_value = buffer;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, TAP_IDLE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	jtag_add_sleep(10);
@@ -704,7 +704,7 @@
 			field.out_value = (buffer + bytes_written);
 			field.in_value = NULL;
 
-			jtag_add_dr_scan(1, &field, TAP_IDLE);
+			jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 
 			/* small delay before polling */
 			jtag_add_sleep(50);
@@ -754,7 +754,7 @@
 		field.out_value = last_dword;
 		field.in_value = NULL;
 
-		jtag_add_dr_scan(1, &field, TAP_IDLE);
+		jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 
 		/* small delay before polling */
 		jtag_add_sleep(50);
@@ -826,7 +826,7 @@
 	field.out_value = NULL;
 	field.in_value = buffer;
 
-	jtag_add_dr_scan(1, &field, TAP_IDLE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 	jtag_execute_queue();
 
 	idcode = buf_get_u32(buffer, 0, 32);
@@ -946,7 +946,7 @@
 	field.out_value = str9xpec_info->options;
 	field.in_value = NULL;
 
-	jtag_add_dr_scan(1, &field, TAP_IDLE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 
 	/* small delay before polling */
 	jtag_add_sleep(50);

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/pld/virtex2.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -58,7 +58,7 @@
 
 
 
-		jtag_add_ir_scan(1, &field, TAP_IDLE);
+		jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_IDLE));
 
 		free(field.out_value);
 	}
@@ -186,11 +186,11 @@
 
 	jtag_add_end_state(TAP_IDLE);
 	virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
-	jtag_add_runtest(13, TAP_IDLE);
+	jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE));
 	virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
 	virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
 	virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
-	jtag_add_runtest(13, TAP_IDLE);
+	jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE));
 	virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
 	jtag_execute_queue();
 

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/target/arm11_dbgtap.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -439,7 +439,7 @@
 		{
 			Data	    = *data;
 
-			arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_IDLE);
+			arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE));
 
 			CHECK_RETVAL(jtag_execute_queue());
 
@@ -532,7 +532,7 @@
 		}
 		else
 		{
-			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_IDLE);
+			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE));
 		}
 	}
 

Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/target/arm7_9_common.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -1731,7 +1731,7 @@
 	}
 	arm_jtag_set_instr(jtag_info, 0x4, NULL);
 
-	jtag_add_runtest(1, TAP_IDLE);
+	jtag_add_runtest(1, jtag_add_end_state(TAP_IDLE));
 	return jtag_execute_queue();
 }
 

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/target/arm_adi_v5.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -70,7 +70,7 @@
 
 	/* Add specified number of tck clocks before accessing memory bus */
 	if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
-		jtag_add_runtest(swjdp->memaccess_tck, TAP_IDLE);
+		jtag_add_runtest(swjdp->memaccess_tck, jtag_add_end_state(TAP_IDLE));
 
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 3;
@@ -101,7 +101,7 @@
 
 	/* Add specified number of tck clocks before accessing memory bus */
 	if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
-		jtag_add_runtest(swjdp->memaccess_tck, TAP_IDLE);
+		jtag_add_runtest(swjdp->memaccess_tck, jtag_add_end_state(TAP_IDLE));
 
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 3;

Modified: trunk/src/target/avrt.c
===================================================================
--- trunk/src/target/avrt.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/target/avrt.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -218,7 +218,7 @@
 		field[0].num_bits = tap->ir_length;
 		field[0].out_value = ir_out;
 		field[0].in_value = ir_in;
-		jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, TAP_IDLE);
+		jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, jtag_add_end_state(TAP_IDLE));
 	}
 
 	return ERROR_OK;
@@ -239,7 +239,7 @@
 		field[0].num_bits = dr_len;
 		field[0].out_value = dr_out;
 		field[0].in_value = dr_in;
-		jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, TAP_IDLE);
+		jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, jtag_add_end_state(TAP_IDLE));
 	}
 
 	return ERROR_OK;

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-06-04 11:42:34 UTC (rev 2043)
+++ trunk/src/target/xscale.c	2009-06-04 12:06:31 UTC (rev 2044)
@@ -363,7 +363,7 @@
 
 			fields[1].in_value = (u8 *)(field1+i);
 
-			jtag_add_dr_scan_check(3, fields, TAP_IDLE);
+			jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_IDLE));
 
 			jtag_add_callback(xscale_getbuf, (u8 *)(field1+i));
 
@@ -477,7 +477,7 @@
 			jtag_add_pathmove(sizeof(noconsume_path)/sizeof(*noconsume_path), noconsume_path);
 		}
 
-		jtag_add_dr_scan(3, fields, TAP_IDLE);
+		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE));
 
 		jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
 		jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@@ -560,7 +560,7 @@
 	LOG_DEBUG("polling RX");
 	for (;;)
 	{
-		jtag_add_dr_scan(3, fields, TAP_IDLE);
+		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE));
 
 		jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
 		jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
@@ -592,7 +592,7 @@
 
 	/* set rx_valid */
 	field2 = 0x1;
-	jtag_add_dr_scan(3, fields, TAP_IDLE);
+	jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_IDLE));
 
 	if ((retval = jtag_execute_queue()) != ERROR_OK)
 	{
@@ -658,7 +658,7 @@
 				3,
 				bits,
 				t,
-				TAP_IDLE);
+				jtag_add_end_state(TAP_IDLE));
 		buffer += size;
 	}
 
@@ -1646,7 +1646,7 @@
 		/* wait 300ms; 150 and 100ms were not enough */
 		jtag_add_sleep(300*1000);
 
-		jtag_add_runtest(2030, TAP_IDLE);
+		jtag_add_runtest(2030, jtag_add_end_state(TAP_IDLE));
 		jtag_execute_queue();
 
 		/* set Hold reset, Halt mode and Trap Reset */
@@ -1709,7 +1709,7 @@
 		xscale_load_ic(target, 1, 0x0, xscale->low_vectors);
 		xscale_load_ic(target, 1, 0xffff0000, xscale->high_vectors);
 
-		jtag_add_runtest(30, TAP_IDLE);
+		jtag_add_runtest(30, jtag_add_end_state(TAP_IDLE));
 
 		jtag_add_sleep(100000);
 

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

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 13:42:34 +0200 (Thu, 04 Jun 2009)
New Revision: 2043

Modified:
   trunk/src/jtag/jtag.c
Log:
use assert() to catch TAP_INVALID passed to jtag_add_xxx() fn's.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-04 11:33:36 UTC (rev 2042)
+++ trunk/src/jtag/jtag.c	2009-06-04 11:42:34 UTC (rev 2043)
@@ -394,9 +394,10 @@
 {
 	jtag_checks();
 
-	if (state != TAP_INVALID)
-		jtag_add_end_state(state);
+	assert(state!=TAP_INVALID);
 
+	jtag_add_end_state(state);
+
 	cmd_queue_cur_state = cmd_queue_end_state;
 }
 
@@ -575,9 +576,10 @@
 		int num_fields, const int* num_bits, const u32* value,
 		tap_state_t end_state)
 {
-	if (end_state != TAP_INVALID)
-		cmd_queue_end_state = end_state;
+	assert(end_state != TAP_INVALID);
 
+	cmd_queue_end_state = end_state;
+
 	cmd_queue_cur_state = cmd_queue_end_state;
 
 	interface_jtag_add_dr_out(tap,