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

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

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

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


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:43:23 UTC (rev 2067)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:32 UTC (rev 2068)
@@ -246,7 +246,7 @@
 	return jtag_num_taps;
 }
 
-int jtag_NumEnabledTaps(void)
+int jtag_tap_count_enabled(void)
 {
 	jtag_tap_t *t;
 	int n;
@@ -1100,10 +1100,10 @@
 	}
 
 	/* see if number of discovered devices matches configuration */
-	if (device_count != jtag_NumEnabledTaps())
+	if (device_count != jtag_tap_count_enabled())
 	{
 		LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match (enabled) configuration (%i), total taps: %d",
-				  device_count, jtag_NumEnabledTaps(), jtag_tap_count());
+				  device_count, jtag_tap_count_enabled(), jtag_tap_count());
 		LOG_ERROR("check the config file and ensure proper JTAG communication (connections, speed, ...)");
 		return ERROR_JTAG_INIT_FAILED;
 	}

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:43:23 UTC (rev 2067)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:32 UTC (rev 2068)
@@ -181,7 +181,7 @@
 extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
 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_tap_count_enabled(void);
 extern int jtag_tap_count(void);
 
 static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)

Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:23 UTC (rev 2067)
+++ trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:32 UTC (rev 2068)
@@ -75,7 +75,7 @@
  */
 int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
 {
-	size_t num_taps = jtag_NumEnabledTaps();
+	size_t num_taps = jtag_tap_count_enabled();
 
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
 	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
@@ -138,7 +138,7 @@
 		field++;
 	}
 
-	assert(field == out_fields + num_taps); /* paranoia: jtag_NumEnabledTaps() and jtag_NextEnabledTap() not in sync */
+	assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_NextEnabledTap() not in sync */
 
 	return ERROR_OK;
 }