summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-06-18 13:52:15 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-06-18 13:52:15 +0000
commit77fd8150ce8dd0f86515647c10d81f5932cb9cdc (patch)
treec9537f594d4ab0d4b608eb01da26642588e77426 /src
parent46bdbc5dbdccd15412749dd5e58adc16e1ad7bbb (diff)
downloadopenocd+libswd-77fd8150ce8dd0f86515647c10d81f5932cb9cdc.tar.gz
openocd+libswd-77fd8150ce8dd0f86515647c10d81f5932cb9cdc.tar.bz2
openocd+libswd-77fd8150ce8dd0f86515647c10d81f5932cb9cdc.tar.xz
openocd+libswd-77fd8150ce8dd0f86515647c10d81f5932cb9cdc.zip
Pavel Chromy:
- TAP reset without TRST shall be called TLR (stands for test-logic-reset, named after the TAP state it ends is) rather than tms (test-mode-select) - some comments changed to /* C coding style */ git-svn-id: svn://svn.berlios.de/openocd/trunk@717 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/jtag.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 3a1fbae9..27b453d5 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -106,7 +106,7 @@ tap_transition_t tap_transitions[16] =
char* jtag_event_strings[] =
{
- "JTAG controller reset(tms or TRST)"
+ "JTAG controller reset (TLR or TRST)"
};
/* kludge!!!! these are just global variables that the
@@ -927,7 +927,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
/* FIX!!! there are *many* different cases here. A better
* approach is needed for legal combinations of transitions...
- */
+ */
if ((jtag_reset_config & RESET_HAS_SRST)&&
(jtag_reset_config & RESET_HAS_TRST)&&
((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
@@ -937,7 +937,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
((req_srst&&!jtag_srst)||
(!req_srst&&jtag_srst)))
{
- // FIX!!! srst_pulls_trst allows 1,1 => 0,0 transition....
+ /* FIX!!! srst_pulls_trst allows 1,1 => 0,0 transition.... */
//LOG_ERROR("BUG: transition of req_tlr_or_trst and req_srst in the same jtag_add_reset() call is undefined");
}
}
@@ -1000,7 +1000,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
if (trst_with_tlr)
{
- LOG_DEBUG("JTAG reset with tms instead of TRST");
+ LOG_DEBUG("JTAG reset with TLR instead of TRST");
jtag_add_end_state(TAP_TLR);
jtag_add_tlr();
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
@@ -1578,11 +1578,11 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
return retval;
- LOG_DEBUG("Trying to bring the JTAG controller to life by asserting TRST / tms");
+ LOG_DEBUG("Trying to bring the JTAG controller to life by asserting TRST / TLR");
/* Reset can happen after a power cycle.
*
- * Ideally we would only assert TRST or run tms before the target reset.
+ * Ideally we would only assert TRST or run TLR before the target reset.
*
* However w/srst_pulls_trst, trst is asserted together with the target
* reset whether we want it or not.
@@ -1595,7 +1595,7 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
* NB! order matters!!!! srst *can* disconnect JTAG circuitry
*
*/
- jtag_add_reset(1, 0); /* TMS or TRST */
+ jtag_add_reset(1, 0); /* TLR or TRST */
if (jtag_reset_config & RESET_HAS_SRST)
{
jtag_add_reset(1, 1);