arm7/9: enable check that DCC downloads have been enabled

[openocd.git] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 9f260642fc462307cffe3e80be1af62955cd1e3e..e490f2e546b8b3c809da91f2db8937a450707d6f 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -101,6 +101,10 @@ static int adi_jtag_dp_scan(struct swjdp_common *swjdp,
        arm_jtag_set_instr(jtag_info, instr, NULL);
 
        /* Add specified number of tck clocks before accessing memory bus */
+
+       /* REVISIT these TCK cycles should be *AFTER*  updating APACC, since
+        * they provide more time for the (MEM) AP to complete the read ...
+        */
        if ((instr == JTAG_DP_APACC)
                        && ((reg_addr == AP_REG_DRW)
                                || ((reg_addr & 0xF0) == AP_REG_BD0))
@@ -137,6 +141,10 @@ static int adi_jtag_dp_scan_u32(struct swjdp_common *swjdp,
        arm_jtag_set_instr(jtag_info, instr, NULL);
 
        /* Add specified number of tck clocks before accessing memory bus */
+
+       /* REVISIT these TCK cycles should be *AFTER*  updating APACC, since
+        * they provide more time for the (MEM) AP to complete the read ...
+        */
        if ((instr == JTAG_DP_APACC)
                        && ((reg_addr == AP_REG_DRW)
                                || ((reg_addr & 0xF0) == AP_REG_BD0))
@@ -249,12 +257,14 @@ int swjdp_transaction_endcheck(struct swjdp_common *swjdp)
 
        swjdp->ack = swjdp->ack & 0x7;
 
-       if (swjdp->ack != 2)
+       /* common code path avoids calling timeval_ms() */
+       if (swjdp->ack != JTAG_ACK_OK_FAULT)
        {
                long long then = timeval_ms();
-               while (swjdp->ack != 2)
+
+               while (swjdp->ack != JTAG_ACK_OK_FAULT)
                {
-                       if (swjdp->ack == 1)
+                       if (swjdp->ack == JTAG_ACK_WAIT)
                        {
                                if ((timeval_ms()-then) > 1000)
                                {
@@ -280,9 +290,6 @@ int swjdp_transaction_endcheck(struct swjdp_common *swjdp)
                                return retval;
                        swjdp->ack = swjdp->ack & 0x7;
                }
-       } else
-       {
-               /* common code path avoids fn to timeval_ms() */
        }
 
        /* Check for STICKYERR and STICKYORUN */