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

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

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

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


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:43 UTC (rev 2069)
@@ -987,7 +987,7 @@
 	}
 
 	/* point at the 1st tap */
-	tap = jtag_NextEnabledTap(NULL);
+	tap = jtag_tap_next_enabled(NULL);
 	if( tap == NULL ){
 		LOG_ERROR("JTAG: No taps enabled?");
 		return ERROR_JTAG_INIT_FAILED;
@@ -1094,7 +1094,7 @@
 						 tap->idcode);
 #endif
 			}
-			tap = jtag_NextEnabledTap(tap);
+			tap = jtag_tap_next_enabled(tap);
 		}
 		device_count++;
 	}
@@ -1122,7 +1122,7 @@
 	tap = NULL;
 	total_ir_length = 0;
 	for(;;){
-		tap = jtag_NextEnabledTap(tap);
+		tap = jtag_tap_next_enabled(tap);
 		if( tap == NULL ){
 			break;
 		}
@@ -1146,7 +1146,7 @@
 	chain_pos = 0;
 	int val;
 	for(;;){
-		tap = jtag_NextEnabledTap(tap);
+		tap = jtag_tap_next_enabled(tap);
 		if( tap == NULL ){
 			break;
 		}
@@ -1677,7 +1677,7 @@
 
 	LOG_DEBUG("Init JTAG chain");
 
-	tap = jtag_NextEnabledTap(NULL);
+	tap = jtag_tap_next_enabled(NULL);
 	if( tap == NULL ){
 		LOG_ERROR("There are no enabled taps?");
 		return ERROR_JTAG_INIT_FAILED;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:43 UTC (rev 2069)
@@ -184,7 +184,7 @@
 extern int jtag_tap_count_enabled(void);
 extern int jtag_tap_count(void);
 
-static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)
+static __inline__ jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p)
 {
 	if (p == NULL)
 	{

Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:43 UTC (rev 2069)
@@ -96,7 +96,7 @@
 
 	/* loop over all enabled TAPs */
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		/* search the input field list for fields for the current TAP */
 
@@ -138,7 +138,7 @@
 		field++;
 	}
 
-	assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_NextEnabledTap() not in sync */
+	assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_tap_next_enabled() not in sync */
 
 	return ERROR_OK;
 }
@@ -182,7 +182,7 @@
 
 	size_t bypass_devices = 0;
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		if (tap->bypass)
 			bypass_devices++;
@@ -207,7 +207,7 @@
 
 	/* loop over all enabled TAPs */
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		/* if TAP is not bypassed insert matching input fields */
 
@@ -271,7 +271,7 @@
 
 	size_t bypass_devices = 0;
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		if (tap->bypass)
 			bypass_devices++;
@@ -299,7 +299,7 @@
 
 	/* loop over all enabled TAPs */
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		/* if TAP is not bypassed insert matching input fields */
 

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/zy1000.c	2009-06-05 00:43:43 UTC (rev 2069)
@@ -511,9 +511,9 @@
 	int j;
 	int scan_size = 0;
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
-		nextTap=jtag_NextEnabledTap(tap);
+		nextTap=jtag_tap_next_enabled(tap);
 		tap_state_t end_state;
 		if (nextTap==NULL)
 		{
@@ -580,9 +580,9 @@
 
 	int j;
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
-		nextTap=jtag_NextEnabledTap(tap);
+		nextTap=jtag_tap_next_enabled(tap);
 		int found=0;
 		tap_state_t end_state;
 		if (nextTap==NULL)
@@ -749,7 +749,7 @@
 {
 //	static int const reg_addr=0x5;
 	tap_state_t end_state=jtag_get_end_state();
-	if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL)
+	if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL)
 	{
 		/* better performance via code duplication */
 		if (little)