Eliminate MixedCaps symbol from public JTAG TAP API:

- Purely mechanical transformations to the source files.
- Rename 'jtag_NumEnabledTaps' as 'jtag_tap_count_enabled.'


git-svn-id: svn://svn.berlios.de/openocd/trunk@2068 b42882b7-edfa-0310-969c-e2dbd0fdcd60

3 files changed, 6 insertions, 6 deletions

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index d10f627f..e9d21d45 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -246,7 +246,7 @@ int jtag_tap_count(void)
 	return jtag_num_taps;
 }
 
-int jtag_NumEnabledTaps(void)
+int jtag_tap_count_enabled(void)
 {
 	jtag_tap_t *t;
 	int n;
@@ -1100,10 +1100,10 @@ static int jtag_examine_chain(void)
 	}
 
 	/* 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;
 	}
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index f7944974..b8e33563 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -181,7 +181,7 @@ 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_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)
diff --git a/src/jtag/jtag_driver.c b/src/jtag/jtag_driver.c
index 70d0f837..55c657e5 100644
--- a/src/jtag/jtag_driver.c
+++ b/src/jtag/jtag_driver.c
@@ -75,7 +75,7 @@ static void cmd_queue_scan_field_clone(scan_field_t * dst, const scan_field_t *
  */
 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 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields,
 		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;
 }