summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomek CEDRO <cederom@tlen.pl>2011-11-15 02:10:12 +0000
committerTomek CEDRO <cederom@tlen.pl>2011-11-15 02:10:12 +0000
commit68703e4a6b8891d93b0381031161abd10ca1e7a0 (patch)
treeaba871c72785d710e4abd36c503bd2e4f058aa16
parenta29770d84b4f624ddfe30b84a2b99308f98f20f6 (diff)
downloadopenocd_libswd-68703e4a6b8891d93b0381031161abd10ca1e7a0.tar.gz
openocd_libswd-68703e4a6b8891d93b0381031161abd10ca1e7a0.tar.bz2
openocd_libswd-68703e4a6b8891d93b0381031161abd10ca1e7a0.tar.xz
openocd_libswd-68703e4a6b8891d93b0381031161abd10ca1e7a0.zip
Minor change in sticky bitnames of ABORT register.
-rw-r--r--src/target/adi_v5_jtag.c10
-rw-r--r--src/target/arm_adi_v5.c4
-rw-r--r--src/target/arm_adi_v5.h12
3 files changed, 13 insertions, 13 deletions
diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index 75461c3f..6cb21841 100644
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -269,7 +269,7 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
/* REVISIT also STICKYCMP, for pushed comparisons (nyet used) */
/* Check for STICKYERR and STICKYORUN */
- if (ctrlstat & (SSTICKYORUN | SSTICKYERR))
+ if (ctrlstat & (STICKYORUN | STICKYERR))
{
LOG_DEBUG("jtag-dp: CTRL/STAT error, 0x%" PRIx32, ctrlstat);
/* Check power to debug regions */
@@ -296,18 +296,18 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
dap->ap_csw_value,
dap->ap_tar_value);
- if (ctrlstat & SSTICKYORUN)
+ if (ctrlstat & STICKYORUN)
LOG_ERROR("JTAG-DP OVERRUN - check clock, "
"memaccess, or reduce jtag speed");
- if (ctrlstat & SSTICKYERR)
+ if (ctrlstat & STICKYERR)
LOG_ERROR("JTAG-DP STICKY ERROR");
/* Clear Sticky Error Bits */
retval = adi_jtag_scan_inout_check_u32(dap, JTAG_DP_DPACC,
DP_CTRL_STAT, DPAP_WRITE,
- dap->dp_ctrl_stat | SSTICKYORUN
- | SSTICKYERR, NULL);
+ dap->dp_ctrl_stat | STICKYORUN
+ | STICKYERR, NULL);
if (retval != ERROR_OK)
return retval;
retval = adi_jtag_scan_inout_check_u32(dap, JTAG_DP_DPACC,
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 8d8487cc..c5c7e698 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -50,7 +50,7 @@
* transaction queue. This primarily affects AP operations (such as using
* a MEM-AP to access memory or registers). If the current transaction has
* not finished by the time the next one must begin, and the ORUNDETECT bit
- * is set in the DP_CTRL_STAT register, the SSTICKYORUN status is set and
+ * is set in the DP_CTRL_STAT register, the STICKYORUN status is set and
* further AP operations will fail. There are two basic methods to avoid
* such overrun errors. One involves polling for status instead of using
* transaction piplining. The other involves adding delays to ensure the
@@ -1172,7 +1172,7 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
return retval;
} else {
//Clear error flags on JTAG-DP
- retval = dap_queue_dp_write(dap, DP_CTRL_STAT, SSTICKYERR);
+ retval = dap_queue_dp_write(dap, DP_CTRL_STAT, STICKYERR);
if (retval != ERROR_OK)
return retval;
}
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 19ea0acf..7579d5f1 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -42,8 +42,8 @@
/* three-bit ACK values for SWD access (sent LSB first) */
#define SWD_ACK_OK 0x1
-#define SWD_ACK_WAIT 0x2
-#define SWD_ACK_FAULT 0x4
+#define SWD_ACK_WAIT 0x2
+#define SWD_ACK_FAULT 0x4
#define DPAP_WRITE 0
#define DPAP_READ 1
@@ -55,7 +55,7 @@
*/
#define DP_IDCODE 0 /* SWD: read */
#define DP_ABORT 0 /* SWD: write */
-#define DP_CTRL_STAT 0x4 /* r/w */
+#define DP_CTRL_STAT 0x4 /* r/w */
#define DP_WCR 0x4 /* SWD: r/w (mux CTRLSEL) */
#define DP_RESEND 0x8 /* SWD: read */
#define DP_SELECT 0x8 /* JTAG: r/w; SWD: write */
@@ -73,10 +73,10 @@
/* Fields of the DP's CTRL/STAT register */
#define CORUNDETECT (1 << 0)
-#define SSTICKYORUN (1 << 1)
+#define STICKYORUN (1 << 1)
/* 3:2 - transaction mode (e.g. pushed compare) */
-#define SSTICKYCMP (1 << 4)
-#define SSTICKYERR (1 << 5)
+#define STICKYCMP (1 << 4)
+#define STICKYERR (1 << 5)
#define READOK (1 << 6) /* SWD-only */
#define WDATAERR (1 << 7) /* SWD-only */
/* 11:8 - mask lanes for pushed compare or verify ops */