diff options
author | Alamy Liu <alamy.liu@gmail.com> | 2015-08-06 14:05:24 -0700 |
---|---|---|
committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2015-12-29 12:34:24 +0000 |
commit | 4dc012865f3856c38c6399df0f85abd59642308a (patch) | |
tree | c6f588505cccdeef3e4c0921415fbe55a92a4974 /src/target/adi_v5_jtag.c | |
parent | f1dac60894a66971ff9eeb2fe7eef1d3e151a0b6 (diff) |
adi_v5: Rename AP_REG_* to MEM_AP_REG_* and add LA support
This is a TODO in the src/target/arm_adi_v5.h for MEM-AP registers.
Some new registers are introduced in ADIv5.2 specification.
MEM_AP_REG_MGT (0x20) // Memory Barrier Transfer register
MEM_AP_REG_TAR64 (0x08) // Bits[63:32] of Transfer Address
MEM_AP_REG_BASE64 (0xF0) // Bits[63:32] of Debug Base Address
Refer to
7.5 MEM-AP register summary in
IHI0031C: ARM Debug Interface Architecture Specification ADIv5.0 to ADIv5.2
Change-Id: I3bc4296a04c35f5c64f851e5865d3099922613fa
Signed-off-by: Alamy Liu <alamy.liu@gmail.com>
Reviewed-on: http://openocd.zylin.com/2904
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/target/adi_v5_jtag.c')
-rw-r--r-- | src/target/adi_v5_jtag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c index c1e12866..c4ed98a7 100644 --- a/src/target/adi_v5_jtag.c +++ b/src/target/adi_v5_jtag.c @@ -115,8 +115,8 @@ static int adi_jtag_dp_scan(struct adiv5_dap *dap, * See "Minimum Response Time" for JTAG-DP, in the ADIv5 spec. */ if ((instr == JTAG_DP_APACC) - && ((reg_addr == AP_REG_DRW) - || ((reg_addr & 0xF0) == AP_REG_BD0)) + && ((reg_addr == MEM_AP_REG_DRW) + || ((reg_addr & 0xF0) == MEM_AP_REG_BD0)) && (dap->memaccess_tck != 0)) jtag_add_runtest(dap->memaccess_tck, TAP_IDLE); @@ -314,12 +314,12 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap) LOG_DEBUG("jtag-dp: CTRL/STAT 0x%" PRIx32, ctrlstat); retval = dap_queue_ap_read(dap, - AP_REG_CSW, &mem_ap_csw); + MEM_AP_REG_CSW, &mem_ap_csw); if (retval != ERROR_OK) return retval; retval = dap_queue_ap_read(dap, - AP_REG_TAR, &mem_ap_tar); + MEM_AP_REG_TAR, &mem_ap_tar); if (retval != ERROR_OK) return retval; |