I just found the following code sequence is used in src/tap/cable.c
and src/tap/idcode.c:
urj_tap_chain_set_trst (chain, 0);
urj_tap_chain_set_trst (chain, 1);
urj_tap_reset (chain);
which happens to be jtag_reset in src/tap/discovery.c. So this patch
moves jtag_reset to src/tap/tap.c, renames it as urj_tap_trst_reset,
and replaces the above code sequence with it in the these two files.
This patch should have no function change effect.
Committed.
Jie
* src/tap/cable.c (urj_tap_cable_start): Use urj_tap_trst_reset.
* src/tap/discovery.c (jtag_reset): Remove.
(urj_tap_discovery): Replace jtag_reset with urj_tap_trst_reset.
* src/tap/tap.c (urj_tap_trst_reset): New function.
* src/tap/idcode.c (urj_tap_idcode): Use urj_tap_trst_reset.
* include/urjtag/tap.h (urj_tap_trst_reset): Declare.
Index: src/tap/cable.c
===================================================================
--- src/tap/cable.c (revision 5702)
+++ src/tap/cable.c (working copy)
@@ -577,9 +577,7 @@ urj_tap_cable_start (urj_chain_t *chain,
return URJ_STATUS_FAIL;
}
- urj_tap_chain_set_trst (chain, 0);
- urj_tap_chain_set_trst (chain, 1);
- urj_tap_reset (chain);
+ urj_tap_trst_reset (chain);
return URJ_STATUS_OK;
}
Index: src/tap/discovery.c
===================================================================
--- src/tap/discovery.c (revision 5704)
+++ src/tap/discovery.c (working copy)
@@ -123,15 +123,6 @@ urj_tap_detect_register_size (urj_chain_
return -1;
}
-static void
-jtag_reset (urj_chain_t *chain)
-{
- urj_tap_chain_set_trst (chain, 0);
- urj_tap_chain_set_trst (chain, 1);
-
- urj_tap_reset (chain);
-}
-
int
urj_tap_discovery (urj_chain_t *chain)
{
@@ -140,7 +131,7 @@ urj_tap_discovery (urj_chain_t *chain)
urj_tap_register_t *irz;
/* detecting IR size */
- jtag_reset (chain);
+ urj_tap_trst_reset (chain);
urj_log (URJ_LOG_LEVEL_NORMAL, _("Detecting IR length ... "));
fflush (stdout);
@@ -172,7 +163,7 @@ urj_tap_discovery (urj_chain_t *chain)
{
int rs;
- jtag_reset (chain);
+ urj_tap_trst_reset (chain);
urj_tap_capture_ir (chain);
urj_tap_shift_register (chain, ir, NULL, 1);
Index: src/tap/tap.c
===================================================================
--- src/tap/tap.c (revision 5702)
+++ src/tap/tap.c (working copy)
@@ -43,6 +43,15 @@ urj_tap_reset (urj_chain_t *chain)
urj_tap_chain_clock (chain, 0, 0, 1); /* Run-Test/Idle */
}
+void
+urj_tap_trst_reset (urj_chain_t *chain)
+{
+ urj_tap_chain_set_trst (chain, 0);
+ urj_tap_chain_set_trst (chain, 1);
+
+ urj_tap_reset (chain);
+}
+
int
urj_tap_reset_bypass (urj_chain_t *chain)
{
Index: src/tap/idcode.c
===================================================================
--- src/tap/idcode.c (revision 5702)
+++ src/tap/idcode.c (working copy)
@@ -66,10 +66,7 @@ urj_tap_idcode (urj_chain_t *chain, unsi
if (!rz || !rout || !rnull)
goto done;
- urj_tap_chain_set_trst (chain, 0);
- urj_tap_chain_set_trst (chain, 1);
-
- urj_tap_reset (chain);
+ urj_tap_trst_reset (chain);
urj_tap_capture_dr (chain);
if (all_rout)
Index: include/urjtag/tap.h
===================================================================
--- include/urjtag/tap.h (revision 5704)
+++ include/urjtag/tap.h (working copy)
@@ -28,6 +28,7 @@
#include "types.h"
void urj_tap_reset (urj_chain_t *chain);
+void urj_tap_trst_reset (urj_chain_t *chain);
/** @return URJ_STATUS_OK on success; URJ_STATUS_FAIL on error */
int urj_tap_reset_bypass (urj_chain_t *chain);
void urj_tap_capture_dr (urj_chain_t *chain);
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
UrJTAG-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/urjtag-development
