[openwince-cvs-commit] jtag/src/tap/cable wiggler.c,1.8,1.9

[Marcel T. <te...@us...>]

Update of /cvsroot/openwince/jtag/src/tap/cable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14596/src/tap/cable

Modified Files:
	wiggler.c 
Log Message:
2004-10-17  Marcel Telka  <ma...@te...>

	* src/tap/cable/wiggler.c (nTRST): Changed pin value (patch 1040199, Andrew Dyer).
	(nSRESET): New pin value (patch 1040199, Andrew Dyer).
	(wiggler_init, wiggler_clock, wiggler_get_tdo, wiggler_set_trst): Changed nTRST to not inverted
		signal (patch 1040199, Andrew Dyer).


Index: wiggler.c
===================================================================
RCS file: /cvsroot/openwince/jtag/src/tap/cable/wiggler.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wiggler.c	11 Sep 2003 16:45:15 -0000	1.8
+++ wiggler.c	17 Oct 2004 15:15:59 -0000	1.9
@@ -38,10 +38,11 @@
 /*
  * data D[7:0] (pins 9:2)
  */
+#define	nTRST	4	/* nTRST is not inverted in the cable */
 #define	TDI	3
 #define	TCK	2
 #define	TMS	1
-#define	nTRST	0
+#define	nSRESET 0	/* sRESET is inverted in the cable */
 
 /*
  * 7 - BUSY (pin 11)
@@ -61,11 +62,11 @@
 		return -1;
 
 	if ((data = parport_get_data( cable->port )) < 0) {
-		if (parport_set_data( cable->port, 0 << nTRST ))
+		if (parport_set_data( cable->port, 1 << nTRST ))
 			return -1;
 		PARAM_TRST(cable) = 1;
 	} else
-		PARAM_TRST(cable) = ((data >> nTRST) ^ 1) & 1;
+		PARAM_TRST(cable) = (data >> nTRST) & 1;
 
 	return 0;
 }
@@ -76,16 +77,16 @@
 	tms = tms ? 1 : 0;
 	tdi = tdi ? 1 : 0;
 
-	parport_set_data( cable->port, ((PARAM_TRST(cable) ^ 1) << nTRST) | (0 << TCK) | (tms << TMS) | (tdi << TDI) );
+	parport_set_data( cable->port, (PARAM_TRST(cable) << nTRST) | (0 << TCK) | (tms << TMS) | (tdi << TDI) );
 	cable_wait();
-	parport_set_data( cable->port, ((PARAM_TRST(cable) ^ 1) << nTRST) | (1 << TCK) | (tms << TMS) | (tdi << TDI) );
+	parport_set_data( cable->port, (PARAM_TRST(cable) << nTRST) | (1 << TCK) | (tms << TMS) | (tdi << TDI) );
 	cable_wait();
 }
 
 static int
 wiggler_get_tdo( cable_t *cable )
 {
-	parport_set_data( cable->port, ((PARAM_TRST(cable) ^ 1) << nTRST) | (0 << TCK) );
+	parport_set_data( cable->port, (PARAM_TRST(cable) << nTRST) | (0 << TCK) );
 	cable_wait();
 	return (parport_get_status( cable->port ) >> TDO) & 1;
 }
@@ -95,7 +96,7 @@
 {
 	PARAM_TRST(cable) = trst ? 1 : 0;
 
-	parport_set_data( cable->port, (PARAM_TRST(cable) ^ 1) << nTRST );
+	parport_set_data( cable->port, PARAM_TRST(cable) << nTRST );
 	return PARAM_TRST(cable);
 }