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

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

Author: zwelch
Date: 2009-06-11 09:08:14 +0200 (Thu, 11 Jun 2009)
New Revision: 2185

Modified:
   trunk/src/jtag/core.c
   trunk/src/jtag/jtag.h
Log:
Out-of-line jtag_tap_next_enabled and simplify its logic.


Modified: trunk/src/jtag/core.c
===================================================================
--- trunk/src/jtag/core.c	2009-06-11 07:08:03 UTC (rev 2184)
+++ trunk/src/jtag/core.c	2009-06-11 07:08:14 UTC (rev 2185)
@@ -202,6 +202,18 @@
 	return t;
 }
 
+jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p)
+{
+	p = p ? p->next_tap : jtag_all_taps();
+	while (p)
+	{
+		if (p->enabled)
+			return p;
+		p = p->next_tap;
+	}
+	return NULL;
+}
+
 const char *jtag_tap_name(const jtag_tap_t *tap)
 {
 	return (tap == NULL) ? "(unknown)" : tap->dotted_name;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-11 07:08:03 UTC (rev 2184)
+++ trunk/src/jtag/jtag.h	2009-06-11 07:08:14 UTC (rev 2185)
@@ -180,37 +180,11 @@
 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_position(unsigned abs_position);
+extern jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p);
 extern unsigned jtag_tap_count_enabled(void);
 extern unsigned jtag_tap_count(void);
 
-static __inline__ jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p)
-{
-	if (p == NULL)
-	{
-		/* start at the head of list */
-		p = jtag_all_taps();
-	}
-	else
-	{
-		/* start *after* this one */
-		p = p->next_tap;
-	}
-	while (p)
-	{
-		if (p->enabled)
-		{
-			break;
-		}
-		else
-		{
-			p = p->next_tap;
-		}
-	}
 
-	return p;
-}
-
-
 enum reset_line_mode {
 	LINE_OPEN_DRAIN = 0x0,
 	LINE_PUSH_PULL  = 0x1,