{
jtag_prelude(TAP_TLR);
int retval;
{
jtag_prelude(TAP_TLR);
int retval;
- retval=interface_jtag_add_tms();
+ retval=interface_jtag_add_tlr();
if (retval!=ERROR_OK)
jtag_error=retval;
}
if (retval!=ERROR_OK)
jtag_error=retval;
}
-int MINIDRIVER(interface_jtag_add_tms)()
+int MINIDRIVER(interface_jtag_add_tlr)()
{
enum tap_state state = TAP_TLR;
jtag_command_t **last_cmd = jtag_get_last_command_p();
{
enum tap_state state = TAP_TLR;
jtag_command_t **last_cmd = jtag_get_last_command_p();
-void jtag_add_reset(int req_tms_or_trst, int req_srst)
+void jtag_add_reset(int req_tlr_or_trst, int req_srst)
int retval;
/* Make sure that jtag_reset_config allows the requested reset */
/* if SRST pulls TRST, we can't fulfill srst == 1 with trst == 0 */
int retval;
/* Make sure that jtag_reset_config allows the requested reset */
/* if SRST pulls TRST, we can't fulfill srst == 1 with trst == 0 */
- if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tms_or_trst))
+ if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tlr_or_trst))
{
LOG_ERROR("BUG: requested reset would assert trst");
jtag_error=ERROR_FAIL;
{
LOG_ERROR("BUG: requested reset would assert trst");
jtag_error=ERROR_FAIL;
}
/* if TRST pulls SRST, we reset with TAP T-L-R */
}
/* if TRST pulls SRST, we reset with TAP T-L-R */
- if (((jtag_reset_config & RESET_TRST_PULLS_SRST) && (req_tms_or_trst)) && (req_srst == 0))
+ if (((jtag_reset_config & RESET_TRST_PULLS_SRST) && (req_tlr_or_trst)) && (req_srst == 0))
}
if (req_srst && !(jtag_reset_config & RESET_HAS_SRST))
}
if (req_srst && !(jtag_reset_config & RESET_HAS_SRST))
- if (!trst_with_tms && (jtag_reset_config & RESET_HAS_TRST))
+ if (!trst_with_tlr && (jtag_reset_config & RESET_HAS_TRST))
{
jtag_trst = 1;
} else
{
{
jtag_trst = 1;
} else
{
jtag_add_sleep(jtag_nsrst_delay * 1000);
}
jtag_add_sleep(jtag_nsrst_delay * 1000);
}
{
LOG_DEBUG("JTAG reset with tms instead of TRST");
jtag_add_end_state(TAP_TLR);
{
LOG_DEBUG("JTAG reset with tms instead of TRST");
jtag_add_end_state(TAP_TLR);
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
return;
}
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
return;
}
register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,
COMMAND_CONFIG, NULL);
register_command(cmd_ctx, NULL, "jtag_nsrst_delay", handle_jtag_nsrst_delay_command,
register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,
COMMAND_CONFIG, NULL);
register_command(cmd_ctx, NULL, "jtag_nsrst_delay", handle_jtag_nsrst_delay_command,
+ COMMAND_ANY, "jtag_nsrst_delay <ms> - delay after deasserting srst in ms");
register_command(cmd_ctx, NULL, "jtag_ntrst_delay", handle_jtag_ntrst_delay_command,
register_command(cmd_ctx, NULL, "jtag_ntrst_delay", handle_jtag_ntrst_delay_command,
+ COMMAND_ANY, "jtag_ntrst_delay <ms> - delay after deasserting trst in ms");
register_command(cmd_ctx, NULL, "scan_chain", handle_scan_chain_command,
COMMAND_EXEC, "print current scan chain configuration");
register_command(cmd_ctx, NULL, "scan_chain", handle_scan_chain_command,
COMMAND_EXEC, "print current scan chain configuration");
jtag_execute_queue();
/* examine chain first, as this could discover the real chain layout */
jtag_execute_queue();
/* examine chain first, as this could discover the real chain layout */
/* run a TAP_TLR reset. End state is TAP_TLR, regardless
* of start state.
*/
/* run a TAP_TLR reset. End state is TAP_TLR, regardless
* of start state.
*/
-extern void jtag_add_tms();
-extern int interface_jtag_add_tms();
+extern void jtag_add_tlr();
+extern int interface_jtag_add_tlr();
/* Do not use jtag_add_pathmove() unless you need to, but do use it
* if you have to.
*
/* Do not use jtag_add_pathmove() unless you need to, but do use it
* if you have to.
*
-extern void jtag_add_reset(int req_tms_or_trst, int srst);
+extern void jtag_add_reset(int req_tlr_or_trst, int srst);
/* this drives the actual srst and trst pins. srst will always be 0
* if jtag_reset_config & RESET_SRST_PULLS_TRST != 0 and ditto for
* trst.
*
/* this drives the actual srst and trst pins. srst will always be 0
* if jtag_reset_config & RESET_SRST_PULLS_TRST != 0 and ditto for
* trst.
*
- * the higher level jtag_add_reset will invoke jtag_add_tms() if
+ * the higher level jtag_add_reset will invoke jtag_add_tlr() if
* approperiate
*/
extern int interface_jtag_add_reset(int trst, int srst);
* approperiate
*/
extern int interface_jtag_add_reset(int trst, int srst);
data[0] = 0xaa995566; /* synch word */
data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */
data[0] = 0xaa995566; /* synch word */
data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */
jtag_add_dr_scan(1, &field, TAP_PD);
jtag_execute_queue();
jtag_add_dr_scan(1, &field, TAP_PD);
jtag_execute_queue();
jtag_add_end_state(TAP_RTI);
virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */
jtag_add_end_state(TAP_RTI);
virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */