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

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

Author: zwelch
Date: 2009-06-09 10:41:08 +0200 (Tue, 09 Jun 2009)
New Revision: 2165

Modified:
   trunk/src/jtag/core.c
   trunk/src/jtag/tcl.c
Log:
Properly encapsulate core hasKHZ variable.


Modified: trunk/src/jtag/core.c
===================================================================
--- trunk/src/jtag/core.c	2009-06-09 08:41:00 UTC (rev 2164)
+++ trunk/src/jtag/core.c	2009-06-09 08:41:08 UTC (rev 2165)
@@ -100,13 +100,13 @@
 /* speed in kHz*/
 static int speed_khz = 0;
 /* flag if the kHz speed was defined */
-bool hasKHz = false;
+static bool hasKHz = false;
+static int jtag_speed = 0;
 
 struct jtag_interface_s *jtag = NULL;
 
 /* configuration */
 jtag_interface_t *jtag_interface = NULL;
-static int jtag_speed = 0;
 
 void jtag_set_error(int error)
 {
@@ -1188,6 +1188,7 @@
 	jtag_speed = speed;
 	/* this command can be called during CONFIG,
 	 * in which case jtag isn't initialized */
+	hasKHz = !jtag;
 	return jtag ? jtag->speed(speed) : ERROR_OK;
 }
 

Modified: trunk/src/jtag/tcl.c
===================================================================
--- trunk/src/jtag/tcl.c	2009-06-09 08:41:00 UTC (rev 2164)
+++ trunk/src/jtag/tcl.c	2009-06-09 08:41:08 UTC (rev 2165)
@@ -39,8 +39,6 @@
 #include <strings.h>
 #endif
 
-extern bool hasKHz;
-
 extern const Jim_Nvp nvp_jtag_tap_event[];
 
 /* jtag interfaces (parport, FTDI-USB, TI-USB, ...)
@@ -994,11 +992,8 @@
 				return retval;
 			}
 			cur_speed = speed_div1;
-
-			retval = jtag_set_speed(cur_speed);
 		}
-		else
-			hasKHz = true;
+		retval = jtag_set_speed(cur_speed);
 	}
 
 	cur_speed = jtag_get_speed_khz();