-clean up the last patch - remove unneeded code (submitted upstream)

-add a "sync" option to the "dr" command which sets the next written
 value to the last read one, seems useful to me to do least invasive
 tests in a running system
-flush stdout on progress reports of the svf player (fixed differently
 in the development branch upstream)
bump PKGREVISION

5 files changed, 85 insertions, 7 deletions

diff --git a/misc/urjtag/Makefile b/misc/urjtag/Makefile
index b3920b12c16..dfd1b1c0c6b 100644
--- a/misc/urjtag/Makefile
+++ b/misc/urjtag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/08/03 15:22:27 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/08/09 19:37:45 drochner Exp $
 #
 
 DISTNAME=	urjtag-0.10
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://downloads.sourceforge.net/project/urjtag/urjtag/0.10/
 
diff --git a/misc/urjtag/distinfo b/misc/urjtag/distinfo
index 25c4fe07f90..c7e212eecbc 100644
--- a/misc/urjtag/distinfo
+++ b/misc/urjtag/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2010/08/03 15:22:27 drochner Exp $
+$NetBSD: distinfo,v 1.4 2010/08/09 19:37:45 drochner Exp $
 
 SHA1 (urjtag-0.10.tar.gz) = 1e21f07d758e9e151d932e95c0b3b11fd178eace
 RMD160 (urjtag-0.10.tar.gz) = d22dcaf8447e594f5fbb25836df141e2a451760a
@@ -7,4 +7,6 @@ SHA1 (patch-aa) = 0c5128a37f763eb5f436f7682cbb1172f1c8fe40
 SHA1 (patch-ab) = 1187447787012901d59f8967ae08c1047e23f38e
 SHA1 (patch-ac) = 1d241fb503e45a57f63f87eeada6804dbb278502
 SHA1 (patch-ad) = 3dcf6a0297b339db1b52a8d9cb6fe907e589b07b
-SHA1 (patch-ae) = 791cf819bad265d11c7ecd72cd89784f67428a20
+SHA1 (patch-ae) = 553df429f2c8369536a0c0b8a788688d73568dd8
+SHA1 (patch-af) = 971c0548ee1aeb49017b490cdd40dd2e4d865b47
+SHA1 (patch-ag) = d13c2160788293a7e6b64ab1cc8ed506d399ef8b
diff --git a/misc/urjtag/patches/patch-ae b/misc/urjtag/patches/patch-ae
index 2a8e9bbe1d5..429d1f1c0c5 100644
--- a/misc/urjtag/patches/patch-ae
+++ b/misc/urjtag/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2010/08/03 15:22:27 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2010/08/09 19:37:45 drochner Exp $
 
 --- src/tap/cable/generic.c.orig	2009-04-17 20:24:10.000000000 +0000
 +++ src/tap/cable/generic.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1 2010/08/03 15:22:27 drochner Exp $
  	do
  	{
 -		int r, bits = 0, tdo = 0;
-+		int r, bits = 0, tdo = 0, savbits;
++		int r, bits = 0, savbits;
  
  #ifdef VERBOSE
  		printf("flush(%d)\n", cable->todo.num_items);
@@ -19,7 +19,21 @@ $NetBSD: patch-ae,v 1.1 2010/08/03 15:22:27 drochner Exp $
  
  		if(bits == 0 || n <= 1)
  		{
-@@ -320,6 +321,10 @@ generic_flush_using_transfer( cable_t *c
+@@ -309,17 +310,21 @@ generic_flush_using_transfer( cable_t *c
+ 			{
+ 				if(cable->todo.data[i].action == CABLE_CLOCK)
+ 				{
+-					int k;
+-					for(k=0;k<cable->todo.data[i].arg.clock.n;k++)
+-						tdo = out[bits++];
++
++					bits += cable->todo.data[i].arg.clock.n;
+ 				}
+ 				else if(cable->todo.data[i].action == CABLE_GET_TDO)
+ 				{
++					int tdo;
+ 					int c = cable_add_queue_item( cable, &(cable->done) );
+ #ifdef VERBOSE
  					printf("add result from transfer to %p.%d\n", &(cable->done), c);
  #endif
  					cable->done.data[c].action = CABLE_GET_TDO;
@@ -30,3 +44,11 @@ $NetBSD: patch-ae,v 1.1 2010/08/03 15:22:27 drochner Exp $
  					cable->done.data[c].arg.value.val = tdo;
  				}
  				else if(cable->todo.data[i].action == CABLE_TRANSFER)
+@@ -340,7 +345,6 @@ generic_flush_using_transfer( cable_t *c
+ 						if(len > 0) memcpy(p, out+bits, len);
+ 					}
+ 					if(len>0) bits += len;
+-					if(bits>0) tdo = out[bits-1];
+ 				}
+ 				i++;
+ 				if(i >= cable->todo.max_items) i = 0;
diff --git a/misc/urjtag/patches/patch-af b/misc/urjtag/patches/patch-af
new file mode 100644
index 00000000000..ebf8a4e66aa
--- /dev/null
+++ b/misc/urjtag/patches/patch-af
@@ -0,0 +1,42 @@
+$NetBSD: patch-af,v 1.1 2010/08/09 19:37:45 drochner Exp $
+
+--- src/cmd/dr.c.orig	2009-04-17 20:24:09.000000000 +0000
++++ src/cmd/dr.c
+@@ -36,7 +36,7 @@ static int
+ cmd_dr_run( chain_t *chain, char *params[] )
+ {
+ 	int dir = 1;
+-	tap_register *r;
++	tap_register *r, *r1;
+ 
+ 	if (cmd_params( params ) < 1 || cmd_params( params ) > 2)
+ 		return -1;
+@@ -68,7 +68,12 @@ cmd_dr_run( chain_t *chain, char *params
+ 			dir = 0;
+ 		else if (strcasecmp( params[1], "out" ) == 0)
+ 			dir = 1;
+-		else {
++		else if (strcasecmp( params[1], "sync" ) == 0) {
++			r = chain->parts->parts[chain->active_part]->active_instruction->data_register->in;
++			r1 = chain->parts->parts[chain->active_part]->active_instruction->data_register->out;
++			memcpy(r->data, r1->data, r->len);
++			dir = 0;
++		} else {
+ 			unsigned int bit;
+ 			if (strspn(params[1], "01") != strlen(params[1])) {
+ 				return -1;
+@@ -101,12 +106,13 @@ cmd_dr_help( void )
+ {
+ 	printf( _(
+ 		"Usage: %s [DIR]\n"
+-		"Usage: %s BITSTRING\n"
++		"Usage: %s BITSTRING | sync\n"
+ 		"Display input or output data register content or set current register.\n"
+ 		"\n"
+ 		"DIR           requested data register; possible values: 'in' for\n"
+ 		"              input and 'out' for output; default is 'out'\n"
+ 		"BITSTRING     set current data register with BITSTRING (e.g. 01010)\n"
++		"sync          set 'in' data register to the 'out' value\n"
+ 	), "dr", "dr" );
+ }
+ 
diff --git a/misc/urjtag/patches/patch-ag b/misc/urjtag/patches/patch-ag
new file mode 100644
index 00000000000..ef7c95232f5
--- /dev/null
+++ b/misc/urjtag/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2010/08/09 19:37:45 drochner Exp $
+
+--- src/svf/svf_flex.c.orig	2009-04-17 20:25:55.000000000 +0000
++++ src/svf/svf_flex.c
+@@ -2332,6 +2332,7 @@ progress_nl(YYLTYPE * mylloc, YY_EXTRA_T
+     printf( "\r" );
+     printf( _("Parsing %6d/%d (%3.0d%%)"),
+             mylloc->last_line, extra->num_lines, percent);
++    fflush(stdout);
+   }
+ }
+