[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-117-gab337d05f

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  ab337d05f432465fdfedb694ac862fb22f80d7a6 (commit)
       via  44554698472aae5b02620eb91837118ada4d2bfe (commit)
      from  a5471b1b2c5675fa0caa462e742916c54f9a08e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab337d05f432465fdfedb694ac862fb22f80d7a6
Author: Tomas Vanek <va...@fb...>
Date:   Tue Apr 6 13:46:07 2021 +0200

    target/arm_adi_v5: move DP register definitions to one block
    
    DP and MEM-AP definitions were mixed.
    
    Change-Id: I2f691b2274c01e9090c1e5160c6903d3207e35c2
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: http://openocd.zylin.com/6138
    Tested-by: jenkins

diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 047606c43..00e4ea2b2 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -85,6 +85,15 @@
 #define CSYSPWRUPREQ    (1UL << 30)
 #define CSYSPWRUPACK    (1UL << 31)
 
+#define DP_SELECT_APSEL 0xFF000000
+#define DP_SELECT_APBANK 0x000000F0
+#define DP_SELECT_DPBANK 0x0000000F
+#define DP_SELECT_INVALID 0x00FFFF00 /* Reserved bits one */
+
+#define DP_APSEL_MAX        (255)
+#define DP_APSEL_INVALID    (-1)
+
+
 /* MEM-AP register addresses */
 #define MEM_AP_REG_CSW		0x00
 #define MEM_AP_REG_TAR		0x04
@@ -150,14 +159,6 @@
 
 #define IDR_JEP106_ARM 0x04760000
 
-#define DP_SELECT_APSEL 0xFF000000
-#define DP_SELECT_APBANK 0x000000F0
-#define DP_SELECT_DPBANK 0x0000000F
-#define DP_SELECT_INVALID 0x00FFFF00 /* Reserved bits one */
-
-#define DP_APSEL_MAX        (255)
-#define DP_APSEL_INVALID    (-1)
-
 /* FIXME: not SWD specific; should be renamed, e.g. adiv5_special_seq */
 enum swd_special_seq {
 	LINE_RESET,

commit 44554698472aae5b02620eb91837118ada4d2bfe
Author: Tomas Vanek <va...@fb...>
Date:   Mon Apr 5 06:32:47 2021 +0200

    target/adi_v5_swd: remove double space from swd_cmd() parameters
    
    Change-Id: I6b68868947010512c4de76e5d37142f067e27b06
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: http://openocd.zylin.com/6137
    Tested-by: jenkins

diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index b25181e21..f1fca40ae 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -74,7 +74,7 @@ static void swd_clear_sticky_errors(struct adiv5_dap *dap)
 	const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
 	assert(swd);
 
-	swd->write_reg(swd_cmd(false,  false, DP_ABORT),
+	swd->write_reg(swd_cmd(false, false, DP_ABORT),
 		STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR, 0);
 }
 
@@ -174,7 +174,7 @@ static int swd_connect(struct adiv5_dap *dap)
 
 		dap->do_reconnect = false;
 
-		swd->write_reg(swd_cmd(false,  false, DP_ABORT),
+		swd->write_reg(swd_cmd(false, false, DP_ABORT),
 			DAPABORT | STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR, 0);
 		status = swd_run_inner(dap);
 	}
@@ -325,7 +325,7 @@ static int swd_queue_ap_read(struct adiv5_ap *ap, unsigned reg,
 	if (retval != ERROR_OK)
 		return retval;
 
-	swd->read_reg(swd_cmd(true,  true, reg), dap->last_read, ap->memaccess_tck);
+	swd->read_reg(swd_cmd(true, true, reg), dap->last_read, ap->memaccess_tck);
 	dap->last_read = data;
 
 	return check_sync(dap);
@@ -347,7 +347,7 @@ static int swd_queue_ap_write(struct adiv5_ap *ap, unsigned reg,
 	if (retval != ERROR_OK)
 		return retval;
 
-	swd->write_reg(swd_cmd(false,  true, reg), data, ap->memaccess_tck);
+	swd->write_reg(swd_cmd(false, true, reg), data, ap->memaccess_tck);
 
 	return check_sync(dap);
 }

-----------------------------------------------------------------------

Summary of changes:
 src/target/adi_v5_swd.c |  8 ++++----
 src/target/arm_adi_v5.h | 17 +++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository