mark usage of in_handler that can be converted into user code

[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 dcc9ced3a691f9e9335b527b9420ddca357bdfbe..0ce994c7866e02dff7f8a2ce15314d38805ed1a8 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -127,7 +127,7 @@ int adi_jtag_dp_scan_u32(arm_jtag_t *jtag_info, u8 instr, u8 reg_addr, u8 RnW, u
        fields[1].in_value = NULL;
        if (invalue)
        {
-               fields[1].in_handler = arm_jtag_buf_to_u32;
+               fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
                fields[1].in_handler_priv = invalue;
        }
        else
@@ -247,7 +247,7 @@ int swjdp_transaction_endcheck(swjdp_common_t *swjdp)
                }
                else
                {
-                       u32 mem_ap_csw;
+                       u32 mem_ap_csw, mem_ap_tar;
 
                        /* Print information about last AHBAP access */
                        LOG_ERROR("AHBAP Cached values: dp_select 0x%x, ap_csw 0x%x, ap_tar 0x%x", swjdp->dp_select_value, swjdp->ap_csw_value, swjdp->ap_tar_value);
@@ -266,9 +266,10 @@ int swjdp_transaction_endcheck(swjdp_common_t *swjdp)
                        LOG_DEBUG("swjdp: status 0x%x", ctrlstat);
 
                        dap_ap_read_reg_u32(swjdp, AP_REG_CSW, &mem_ap_csw);
+                       dap_ap_read_reg_u32(swjdp, AP_REG_TAR, &mem_ap_tar);
                        if ((retval=jtag_execute_queue())!=ERROR_OK)
                                return retval;
-                       LOG_ERROR("Read MEM_AP_CSW 0x%x", mem_ap_csw);
+                       LOG_ERROR("Read MEM_AP_CSW 0x%x, MEM_AP_TAR 0x%x", mem_ap_csw, mem_ap_tar);
 
                }
                if ((retval=jtag_execute_queue())!=ERROR_OK)