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

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-04 15:05:57 +0200 (Thu, 04 Jun 2009)
New Revision: 2048

Modified:
   trunk/src/jtag/jtag.h
   trunk/src/jtag/zy1000.c
Log:
tiny bit of encapsulation of global end state. No longer expose it as a global variable.

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-04 12:52:54 UTC (rev 2047)
+++ trunk/src/jtag/jtag.h	2009-06-04 13:05:57 UTC (rev 2048)
@@ -104,8 +104,6 @@
 
 /// The current TAP state of the pending JTAG command queue.
 extern tap_state_t cmd_queue_cur_state;
-/// The TAP state in which DR scans should end.
-extern tap_state_t cmd_queue_end_state;
 
 /**
  * This structure defines a single scan field in the scan. It provides

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-04 12:52:54 UTC (rev 2047)
+++ trunk/src/jtag/zy1000.c	2009-06-04 13:05:57 UTC (rev 2048)
@@ -748,7 +748,7 @@
 void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
 {
 //	static int const reg_addr=0x5;
-	tap_state_t end_state=cmd_queue_end_state;
+	tap_state_t end_state=jtag_add_end_state(TAP_INVALID);
 	if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL)
 	{
 		/* better performance via code duplication */