diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-01-27 13:40:05 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2010-01-27 13:40:05 -0800 |
| commit | d44f1aaeff45d26348826bdff07caf3d097eca15 (patch) | |
| tree | 77b582edb5bbdc7708b5e0e38fd523bb26906a19 | |
| parent | 2b5c444a32725dd75833348e04620bd7b1bda2ad (diff) | |
| download | openocd_libswd-d44f1aaeff45d26348826bdff07caf3d097eca15.tar.gz openocd_libswd-d44f1aaeff45d26348826bdff07caf3d097eca15.tar.bz2 openocd_libswd-d44f1aaeff45d26348826bdff07caf3d097eca15.tar.xz openocd_libswd-d44f1aaeff45d26348826bdff07caf3d097eca15.zip | |
ARM ADIv5: messaging tweaks
Add space missing after the invalid ACK value. On init, say
which AP is being used, and don't assume it's an AHP-AP.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
| -rw-r--r-- | src/target/arm_adi_v5.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index ba5db3b1..2ba89e5f 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -305,7 +305,7 @@ int swjdp_transaction_endcheck(struct swjdp_common *swjdp) } else { - LOG_WARNING("Invalid ACK %#x" + LOG_WARNING("Invalid ACK %#x " "in JTAG-DP transaction", swjdp->ack); return ERROR_JTAG_DEVICE_ERROR; @@ -1058,6 +1058,7 @@ int mem_ap_read_buf_u8(struct swjdp_common *swjdp, uint8_t *buffer, int count, u * @todo Rename this. We also need an initialization scheme which account * for SWD transports not just JTAG; that will need to address differences * in layering. (JTAG is useful without any debug target; but not SWD.) + * And this may not even use an AHB-AP ... e.g. DAP-Lite uses an APB-AP. */ int ahbap_debugport_init(struct swjdp_common *swjdp) { @@ -1125,7 +1126,9 @@ int ahbap_debugport_init(struct swjdp_common *swjdp) dap_ap_read_reg_u32(swjdp, AP_REG_IDR, &idreg); dap_ap_read_reg_u32(swjdp, AP_REG_BASE, &romaddr); - LOG_DEBUG("AHB-AP ID Register 0x%" PRIx32 ", Debug ROM Address 0x%" PRIx32 "", idreg, romaddr); + LOG_DEBUG("MEM-AP #%d ID Register 0x%" PRIx32 + ", Debug ROM Address 0x%" PRIx32, + swjdp->apsel, idreg, romaddr); return ERROR_OK; } |