Menu
▾
▴
[Openocd-svn] r1235 - in trunk/src: flash jtag target
|
From: <kc...@ma...> - 2008-12-13 07:59:37
|
Author: kc8apf
Date: 2008-12-13 07:59:24 +0100 (Sat, 13 Dec 2008)
New Revision: 1235
Modified:
trunk/src/flash/str9xpec.c
trunk/src/jtag/amt_jtagaccel.c
trunk/src/jtag/bitbang.c
trunk/src/jtag/bitq.c
trunk/src/jtag/gw16012.c
trunk/src/jtag/jlink.c
trunk/src/jtag/jtag.c
trunk/src/jtag/jtag.h
trunk/src/jtag/usbprog.c
trunk/src/jtag/zy1000.c
trunk/src/target/arm11_dbgtap.c
Log:
Clean up references to old tap_state names
Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/flash/str9xpec.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -1338,7 +1338,7 @@
if (tap == NULL)
return ERROR_FAIL;
- /* exit turbo mode via TLR */
+ /* exit turbo mode via RESET */
str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET);
jtag_execute_queue();
Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/amt_jtagaccel.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -100,13 +100,13 @@
*/
u8 amt_jtagaccel_tap_move[6][6][2] =
{
- /* TLR RTI SD PD SI PI */
- {{0x1f, 0x00}, {0x0f, 0x00}, {0x8a, 0x04}, {0x0a, 0x00}, {0x06, 0x00}, {0x96, 0x00}}, /* TLR */
- {{0x1f, 0x00}, {0x00, 0x00}, {0x85, 0x08}, {0x05, 0x00}, {0x8b, 0x08}, {0x0b, 0x00}}, /* RTI */
- {{0x1f, 0x00}, {0x0d, 0x00}, {0x00, 0x00}, {0x01, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* SD */
- {{0x1f, 0x00}, {0x0c, 0x00}, {0x08, 0x00}, {0x00, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* PD */
- {{0x1f, 0x00}, {0x0d, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x00, 0x00}, {0x01, 0x00}}, /* SI */
- {{0x1f, 0x00}, {0x0c, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x08, 0x00}, {0x00, 0x00}}, /* PI */
+ /* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */
+ {{0x1f, 0x00}, {0x0f, 0x00}, {0x8a, 0x04}, {0x0a, 0x00}, {0x06, 0x00}, {0x96, 0x00}}, /* RESET */
+ {{0x1f, 0x00}, {0x00, 0x00}, {0x85, 0x08}, {0x05, 0x00}, {0x8b, 0x08}, {0x0b, 0x00}}, /* IDLE */
+ {{0x1f, 0x00}, {0x0d, 0x00}, {0x00, 0x00}, {0x01, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* DRSHIFT */
+ {{0x1f, 0x00}, {0x0c, 0x00}, {0x08, 0x00}, {0x00, 0x00}, {0x8f, 0x09}, {0x8f, 0x01}}, /* DRPAUSE */
+ {{0x1f, 0x00}, {0x0d, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x00, 0x00}, {0x01, 0x00}}, /* IRSHIFT */
+ {{0x1f, 0x00}, {0x0c, 0x00}, {0x07, 0x00}, {0x97, 0x00}, {0x08, 0x00}, {0x00, 0x00}}, /* IRPAUSE */
};
jtag_interface_t amt_jtagaccel_interface =
@@ -214,7 +214,7 @@
enum tap_state saved_end_state = end_state;
- /* only do a state_move when we're not already in RTI */
+ /* only do a state_move when we're not already in IDLE */
if (cur_state != TAP_IDLE)
{
amt_jtagaccel_end_state(TAP_IDLE);
Modified: trunk/src/jtag/bitbang.c
===================================================================
--- trunk/src/jtag/bitbang.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/bitbang.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -133,7 +133,7 @@
enum tap_state saved_end_state = end_state;
- /* only do a state_move when we're not already in RTI */
+ /* only do a state_move when we're not already in IDLE */
if (cur_state != TAP_IDLE)
{
bitbang_end_state(TAP_IDLE);
Modified: trunk/src/jtag/bitq.c
===================================================================
--- trunk/src/jtag/bitq.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/bitq.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -194,7 +194,7 @@
{
int i;
- /* only do a state_move when we're not already in RTI */
+ /* only do a state_move when we're not already in IDLE */
if (cur_state != TAP_IDLE) bitq_state_move(TAP_IDLE);
/* execute num_cycles */
Modified: trunk/src/jtag/gw16012.c
===================================================================
--- trunk/src/jtag/gw16012.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/gw16012.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -257,7 +257,7 @@
enum tap_state saved_end_state = end_state;
int i;
- /* only do a state_move when we're not already in RTI */
+ /* only do a state_move when we're not already in IDLE */
if (cur_state != TAP_IDLE)
{
gw16012_end_state(TAP_IDLE);
Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/jlink.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -392,7 +392,7 @@
enum tap_state saved_end_state = end_state;
- /* only do a state_move when we're not already in RTI */
+ /* only do a state_move when we're not already in IDLE */
if (cur_state != TAP_IDLE)
{
jlink_end_state(TAP_IDLE);
Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/jtag.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -67,17 +67,17 @@
* 4: Shift-IR
* 5: Pause-IR
*
- * SD->SD and SI->SI have to be caught in interface specific code
+ * DRSHIFT->DRSHIFT and IRSHIFT->IRSHIFT have to be caught in interface specific code
*/
u8 tap_move[6][6] =
{
-/* TLR RTI SD PD SI PI */
- {0x7f, 0x00, 0x17, 0x0a, 0x1b, 0x16}, /* TLR */
- {0x7f, 0x00, 0x25, 0x05, 0x2b, 0x0b}, /* RTI */
- {0x7f, 0x31, 0x00, 0x01, 0x0f, 0x2f}, /* SD */
- {0x7f, 0x30, 0x20, 0x17, 0x1e, 0x2f}, /* PD */
- {0x7f, 0x31, 0x07, 0x17, 0x00, 0x01}, /* SI */
- {0x7f, 0x30, 0x1c, 0x17, 0x20, 0x2f} /* PI */
+/* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */
+ { 0x7f, 0x00, 0x17, 0x0a, 0x1b, 0x16}, /* RESET */
+ { 0x7f, 0x00, 0x25, 0x05, 0x2b, 0x0b}, /* IDLE */
+ { 0x7f, 0x31, 0x00, 0x01, 0x0f, 0x2f}, /* DRSHIFT */
+ { 0x7f, 0x30, 0x20, 0x17, 0x1e, 0x2f}, /* DRPAUSE */
+ { 0x7f, 0x31, 0x07, 0x17, 0x00, 0x01}, /* IRSHIFT */
+ { 0x7f, 0x30, 0x1c, 0x17, 0x20, 0x2f} /* IRPAUSE */
};
int tap_move_map[16] = {
@@ -87,27 +87,27 @@
tap_transition_t tap_transitions[16] =
{
- {TAP_RESET, TAP_IDLE}, /* TLR */
- {TAP_IRSELECT, TAP_DRCAPTURE}, /* SDS */
- {TAP_DREXIT1, TAP_DRSHIFT}, /* CD */
- {TAP_DREXIT1, TAP_DRSHIFT}, /* SD */
- {TAP_DRUPDATE, TAP_DRPAUSE}, /* E1D */
- {TAP_DREXIT2, TAP_DRPAUSE}, /* PD */
- {TAP_DRUPDATE, TAP_DRSHIFT}, /* E2D */
- {TAP_DRSELECT, TAP_IDLE}, /* UD */
- {TAP_DRSELECT, TAP_IDLE}, /* RTI */
- {TAP_RESET, TAP_IRCAPTURE}, /* SIS */
- {TAP_IREXIT1, TAP_IRSHIFT}, /* CI */
- {TAP_IREXIT1, TAP_IRSHIFT}, /* SI */
- {TAP_IRUPDATE, TAP_IRPAUSE}, /* E1I */
- {TAP_IREXIT2, TAP_IRPAUSE}, /* PI */
- {TAP_IRUPDATE, TAP_IRSHIFT}, /* E2I */
- {TAP_DRSELECT, TAP_IDLE} /* UI */
+ {TAP_RESET, TAP_IDLE}, /* RESET */
+ {TAP_IRSELECT, TAP_DRCAPTURE}, /* DRSELECT */
+ {TAP_DREXIT1, TAP_DRSHIFT}, /* DRCAPTURE */
+ {TAP_DREXIT1, TAP_DRSHIFT}, /* DRSHIFT */
+ {TAP_DRUPDATE, TAP_DRPAUSE}, /* DREXIT1 */
+ {TAP_DREXIT2, TAP_DRPAUSE}, /* DRPAUSE */
+ {TAP_DRUPDATE, TAP_DRSHIFT}, /* DREXIT2 */
+ {TAP_DRSELECT, TAP_IDLE}, /* DRUPDATE */
+ {TAP_DRSELECT, TAP_IDLE}, /* IDLE */
+ {TAP_RESET, TAP_IRCAPTURE}, /* IRSELECT */
+ {TAP_IREXIT1, TAP_IRSHIFT}, /* IRCAPTURE */
+ {TAP_IREXIT1, TAP_IRSHIFT}, /* IRSHIFT */
+ {TAP_IRUPDATE, TAP_IRPAUSE}, /* IREXIT1 */
+ {TAP_IREXIT2, TAP_IRPAUSE}, /* IRPAUSE */
+ {TAP_IRUPDATE, TAP_IRSHIFT}, /* IREXIT2 */
+ {TAP_DRSELECT, TAP_IDLE} /* IRUPDATE */
};
char* jtag_event_strings[] =
{
- "JTAG controller reset (TLR or TRST)"
+ "JTAG controller reset (RESET or TRST)"
};
/* kludge!!!! these are just global variables that the
@@ -1153,7 +1153,7 @@
if (trst_with_tlr)
{
- LOG_DEBUG("JTAG reset with TLR instead of TRST");
+ LOG_DEBUG("JTAG reset with RESET instead of TRST");
jtag_add_end_state(TAP_RESET);
jtag_add_tlr();
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
@@ -1198,7 +1198,7 @@
cmd_queue_end_state = state;
if ((cmd_queue_end_state == TAP_DRSHIFT)||(cmd_queue_end_state == TAP_IRSHIFT))
{
- LOG_ERROR("BUG: TAP_DRSHIFT/SI can't be end state. Calling code should use a larger scan field");
+ LOG_ERROR("BUG: TAP_DRSHIFT/IRSHIFT can't be end state. Calling code should use a larger scan field");
}
}
@@ -2096,11 +2096,11 @@
if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
return retval;
- LOG_DEBUG("Trying to bring the JTAG controller to life by asserting TRST / TLR");
+ LOG_DEBUG("Trying to bring the JTAG controller to life by asserting TRST / RESET");
/* Reset can happen after a power cycle.
*
- * Ideally we would only assert TRST or run TLR before the target reset.
+ * Ideally we would only assert TRST or run RESET before the target reset.
*
* However w/srst_pulls_trst, trst is asserted together with the target
* reset whether we want it or not.
@@ -2113,7 +2113,7 @@
* NB! order matters!!!! srst *can* disconnect JTAG circuitry
*
*/
- jtag_add_reset(1, 0); /* TLR or TRST */
+ jtag_add_reset(1, 0); /* RESET or TRST */
if (jtag_reset_config & RESET_HAS_SRST)
{
jtag_add_reset(1, 1);
Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/jtag.h 2008-12-13 06:59:24 UTC (rev 1235)
@@ -310,7 +310,7 @@
* upon subsequent invocations
*/
extern int jtag_interface_init(struct command_context_s *cmd_ctx);
-/* initialize JTAG chain using only a TLR reset. If init fails,
+/* initialize JTAG chain using only a RESET reset. If init fails,
* try reset + init.
*/
extern int jtag_init(struct command_context_s *cmd_ctx);
@@ -320,7 +320,7 @@
/* JTAG interface, can be implemented with a software or hardware fifo
*
- * TAP_DRSHIFT and TAP_IRSHIFT are illegal end states. TAP_DRSHIFT/SI as end states
+ * TAP_DRSHIFT and TAP_IRSHIFT are illegal end states. TAP_DRSHIFT/IRSHIFT as end states
* can be emulated by using a larger scan.
*
* Code that is relatively insensitive to the path(as long
Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/usbprog.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -298,7 +298,7 @@
{
int i;
- /* only do a state_move when we're not already in RTI */
+ /* only do a state_move when we're not already in IDLE */
if (cur_state != TAP_IDLE)
{
usbprog_end_state(TAP_IDLE);
Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/jtag/zy1000.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -176,7 +176,7 @@
if (trst||(srst&&(jtag_reset_config & RESET_SRST_PULLS_TRST)))
{
waitIdle();
- /* we're now in the TLR state until trst is deasserted */
+ /* we're now in the RESET state until trst is deasserted */
ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_RESET);
} else
{
Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c 2008-12-13 06:29:47 UTC (rev 1234)
+++ trunk/src/target/arm11_dbgtap.c 2008-12-13 06:59:24 UTC (rev 1235)
@@ -340,10 +340,10 @@
* Put arm11_run_instr_data_prepare() and arm11_run_instr_data_finish()
* around a block of arm11_run_instr_... calls.
*
- * Any RTI can lead to an instruction execution when
+ * Any IDLE can lead to an instruction execution when
* scan chains 4 or 5 are selected and the IR holds
* INTEST or EXTEST. So we must disable that before
- * any following activities lead to an RTI.
+ * any following activities lead to an IDLE.
*
* \param arm11 Target state variable.
*
@@ -471,7 +471,7 @@
* the core but still shorter than any manually inducible delays.
*
*/
-enum tap_state arm11_MOVE_PD_RTI_PD_with_delay[] =
+enum tap_state arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] =
{
TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
};
@@ -518,8 +518,8 @@
if (count)
{
jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
- jtag_add_pathmove(asizeof(arm11_MOVE_PD_RTI_PD_with_delay),
- arm11_MOVE_PD_RTI_PD_with_delay);
+ jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
+ arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
}
else
{
|
