From: David Brownell <dbrownell@users.sourceforge.net>
Date: Sun, 31 Jan 2010 02:08:19 +0000 (-0800)
Subject: ARM ADIv5: fix diagnostics for block writes
X-Git-Tag: v0.4.0-rc2~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=46b6d5bfe644b5f6a1fe50930c850f09a78b5bad;p=openocd

ARM ADIv5: fix diagnostics for block writes

They were reporting "read" errors, not "write" errors.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index b8744d55..0a6a7ef7 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -641,9 +641,12 @@ static int mem_ap_write_buf_packed_u16(struct swjdp_common *swjdp,
 
 			if (nbytes < 4)
 			{
-				if (mem_ap_write_buf_u16(swjdp, buffer, nbytes, address) != ERROR_OK)
+				if (mem_ap_write_buf_u16(swjdp, buffer,
+						nbytes, address) != ERROR_OK)
 				{
-					LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+					LOG_WARNING("Block write error address "
+						"0x%" PRIx32 ", count 0x%x",
+						address, count);
 					return ERROR_JTAG_DEVICE_ERROR;
 				}
 
@@ -665,7 +668,9 @@ static int mem_ap_write_buf_packed_u16(struct swjdp_common *swjdp,
 				dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
 				if (jtagdp_transaction_endcheck(swjdp) != ERROR_OK)
 				{
-					LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+					LOG_WARNING("Block write error address "
+						"0x%" PRIx32 ", count 0x%x",
+						address, count);
 					return ERROR_JTAG_DEVICE_ERROR;
 				}
 			}
@@ -736,7 +741,9 @@ static int mem_ap_write_buf_packed_u8(struct swjdp_common *swjdp,
 			{
 				if (mem_ap_write_buf_u8(swjdp, buffer, nbytes, address) != ERROR_OK)
 				{
-					LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+					LOG_WARNING("Block write error address "
+						"0x%" PRIx32 ", count 0x%x",
+						address, count);
 					return ERROR_JTAG_DEVICE_ERROR;
 				}
 
@@ -758,7 +765,9 @@ static int mem_ap_write_buf_packed_u8(struct swjdp_common *swjdp,
 				dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
 				if (jtagdp_transaction_endcheck(swjdp) != ERROR_OK)
 				{
-					LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+					LOG_WARNING("Block write error address "
+						"0x%" PRIx32 ", count 0x%x",
+						address, count);
 					return ERROR_JTAG_DEVICE_ERROR;
 				}
 			}