[ 2782581 ] TRST, TMS and TDI incorrectly marked in wiggler2 cable (Yen Rui)

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1578 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
16 years ago · db5c70eedd
parent 52984d817d
commit db5c70eedd
6 changed files with 10 additions and 2 deletions
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@ -1,5 +1,8 @@
 2009-05-07  Arnim Laeuger  <arniml>

+  * src/tap/cable/wiggler2.c: [ 2782581 ] TRST, TMS and TDI incorrectly marked
+    in wiggler2 cable
+
  * src/cmd/test.c: [ 2776954 ] typo? on 'help test'

 2009-05-06  Arnim Laeuger  <arniml>
--- a/jtag/THANKS
+++ b/jtag/THANKS
@ -70,6 +70,7 @@ Ramses VI
 Michel Robitaille
 Hein Roehrig
 Marko Rößler
+Yen Rui
 Frantisek Rysanek
 Benedikt Sauter
 Markus Schneider
--- a/jtag/src/tap/cable/wiggler2.c
+++ b/jtag/src/tap/cable/wiggler2.c
@ -102,7 +102,7 @@ wiggler2_clock( cable_t *cable, int tms, int tdi, int n )
 		cable_wait( cable );
 	}

-	PARAM_SIGNALS(cable) &= CS_TRST;
+	PARAM_SIGNALS(cable) &= ~(CS_TMS | CS_TDI);
 	PARAM_SIGNALS(cable) |= CS_TCK;
 	PARAM_SIGNALS(cable) |= tms ? CS_TMS : 0;
 	PARAM_SIGNALS(cable) |= tdi ? CS_TDI : 0;
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@ -1,5 +1,8 @@
 2009-05-07  Arnim Laeuger  <arniml>

+  * src/tap/cable/wiggler2.c: [ 2782581 ] TRST, TMS and TDI incorrectly marked
+    in wiggler2 cable
+
  * po/POTFILES.in: src/jim/tap.c renamed to jim_tap.c, removed getdelim.c
    and getline.c 

--- a/urjtag/THANKS
+++ b/urjtag/THANKS
@ -70,6 +70,7 @@ Ramses VI
 Michel Robitaille
 Hein Roehrig
 Marko Rößler
+Yen Rui
 Frantisek Rysanek
 Benedikt Sauter
 Markus Schneider
--- a/urjtag/src/tap/cable/wiggler2.c
+++ b/urjtag/src/tap/cable/wiggler2.c
@ -110,7 +110,7 @@ wiggler2_clock (urj_cable_t *cable, int tms, int tdi, int n)
        urj_tap_cable_wait (cable);
    }

-    PARAM_SIGNALS (cable) &= URJ_POD_CS_TRST;
+    PARAM_SIGNALS (cable) &= ~(URJ_POD_CS_TMS | URJ_POD_CS_TDI);
    PARAM_SIGNALS (cable) |= URJ_POD_CS_TCK;
    PARAM_SIGNALS (cable) |= tms ? URJ_POD_CS_TMS : 0;
    PARAM_SIGNALS (cable) |= tdi ? URJ_POD_CS_TDI : 0;