[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] );