[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)
 {