From db5c70eedd18afc56105373cbd2e27ee934bc996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnim=20L=C3=A4uger?= Date: Thu, 7 May 2009 20:54:24 +0000 Subject: [PATCH] [ 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 --- jtag/ChangeLog | 3 +++ jtag/THANKS | 1 + jtag/src/tap/cable/wiggler2.c | 2 +- urjtag/ChangeLog | 3 +++ urjtag/THANKS | 1 + urjtag/src/tap/cable/wiggler2.c | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index f8e89e96..3e069a65 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,5 +1,8 @@ 2009-05-07 Arnim Laeuger + * 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 diff --git a/jtag/THANKS b/jtag/THANKS index 53663703..7cb6b7e3 100644 --- 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 diff --git a/jtag/src/tap/cable/wiggler2.c b/jtag/src/tap/cable/wiggler2.c index e0a2b330..22903717 100644 --- 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; diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index f3d25b00..273aecec 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,5 +1,8 @@ 2009-05-07 Arnim Laeuger + * 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 diff --git a/urjtag/THANKS b/urjtag/THANKS index 53663703..7cb6b7e3 100644 --- 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 diff --git a/urjtag/src/tap/cable/wiggler2.c b/urjtag/src/tap/cable/wiggler2.c index 1b2cae4a..7406679c 100644 --- 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;