head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.126
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.124
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.122
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.120
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.118
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.116
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.114
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.112
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.110
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.108
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.106
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.104
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.102
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.100
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.98
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.96
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.94
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.92
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.90
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.88
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.86
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.84
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.82
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.78
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.58
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.80
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.76
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.74
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.72
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.70
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.68
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.66
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.64
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.62
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.60
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.56
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.54
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.52
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.50
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.48
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.46
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.44
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.42
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.40
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.38
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.36
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.34
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.32
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.30
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.28
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.26
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.24
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.22
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.20
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.18
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.16
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.14
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.12
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.10
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.8
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.6
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.4
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.2
	pkgsrc-2010Q3-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2010.08.09.19.37.45;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2010.08.03.15.22.27;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@-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
@
text
@$NetBSD$

--- src/tap/cable/generic.c.orig	2009-04-17 20:24:10.000000000 +0000
+++ src/tap/cable/generic.c
@@@@ -202,7 +202,7 @@@@ generic_flush_using_transfer( cable_t *c
 
 	do
 	{
-		int r, bits = 0, tdo = 0;
+		int r, bits = 0, savbits;
 
 #ifdef VERBOSE
 		printf("flush(%d)\n", cable->todo.num_items);
@@@@ -254,6 +254,7 @@@@ generic_flush_using_transfer( cable_t *c
 #ifdef VERBOSE
 		printf("%d combined into one (%d bits)\n", n, bits);
 #endif
+		savbits = bits;
 
 		if(bits == 0 || n <= 1)
 		{
@@@@ -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;
+					if (bits < savbits)
+						tdo = out[bits];
+					else
+						tdo = cable->driver->get_tdo(cable);
 					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;
@


1.1
log
@fix a bug in optimizer code which is used by some cable drivers to
reduce the number of transactions which resulted in a wrong TDO
picked up under some circumstances
being here, quell a warning in the usbprog driver which only tells
us what we already know, and improve an error message
bump PKGREVISION
@
text
@d10 1
a10 1
+		int r, bits = 0, tdo = 0, savbits;
d22 15
a36 1
@@@@ -320,6 +321,10 @@@@ generic_flush_using_transfer( cable_t *c
d47 8
@