From 3e8ca67d1f9309d6f7860bdb6e9ad80d60f3ae6e Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Sun, 13 Jun 2021 10:49:17 +0200 Subject: [PATCH] target: Rename 'linked_BRP' to 'linked_brp' Change-Id: I9dd67ac3e8cd5dd9cdeffce56020b387a8f298fa Signed-off-by: Marc Schink Reviewed-on: http://openocd.zylin.com/6316 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/target/aarch64.c | 6 +++--- src/target/breakpoints.h | 2 +- src/target/cortex_a.c | 6 +++--- src/target/nds32.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/target/aarch64.c b/src/target/aarch64.c index ef00fd131..171c28615 100644 --- a/src/target/aarch64.c +++ b/src/target/aarch64.c @@ -1433,7 +1433,7 @@ static int aarch64_set_hybrid_breakpoint(struct target *target, struct breakpoin } breakpoint->set = brp_1 + 1; - breakpoint->linked_BRP = brp_2; + breakpoint->linked_brp = brp_2; control_CTX = ((CTX_machmode & 0x7) << 20) | (brp_2 << 16) | (0 << 14) @@ -1495,7 +1495,7 @@ static int aarch64_unset_breakpoint(struct target *target, struct breakpoint *br if (breakpoint->type == BKPT_HARD) { if ((breakpoint->address != 0) && (breakpoint->asid != 0)) { int brp_i = breakpoint->set - 1; - int brp_j = breakpoint->linked_BRP; + int brp_j = breakpoint->linked_brp; if ((brp_i < 0) || (brp_i >= aarch64->brp_num)) { LOG_DEBUG("Invalid BRP number in breakpoint"); return ERROR_OK; @@ -1545,7 +1545,7 @@ static int aarch64_unset_breakpoint(struct target *target, struct breakpoint *br if (retval != ERROR_OK) return retval; - breakpoint->linked_BRP = 0; + breakpoint->linked_brp = 0; breakpoint->set = 0; return ERROR_OK; diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h index 8c247f7a9..b4a3511d2 100644 --- a/src/target/breakpoints.h +++ b/src/target/breakpoints.h @@ -43,7 +43,7 @@ struct breakpoint { uint8_t *orig_instr; struct breakpoint *next; uint32_t unique_id; - int linked_BRP; + int linked_brp; }; struct watchpoint { diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index ec02d179f..7af0d3d7e 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -1444,7 +1444,7 @@ static int cortex_a_set_hybrid_breakpoint(struct target *target, struct breakpoi } breakpoint->set = brp_1 + 1; - breakpoint->linked_BRP = brp_2; + breakpoint->linked_brp = brp_2; control_CTX = ((CTX_machmode & 0x7) << 20) | (brp_2 << 16) | (0 << 14) @@ -1500,7 +1500,7 @@ static int cortex_a_unset_breakpoint(struct target *target, struct breakpoint *b if (breakpoint->type == BKPT_HARD) { if ((breakpoint->address != 0) && (breakpoint->asid != 0)) { int brp_i = breakpoint->set - 1; - int brp_j = breakpoint->linked_BRP; + int brp_j = breakpoint->linked_brp; if ((brp_i < 0) || (brp_i >= cortex_a->brp_num)) { LOG_DEBUG("Invalid BRP number in breakpoint"); return ERROR_OK; @@ -1539,7 +1539,7 @@ static int cortex_a_unset_breakpoint(struct target *target, struct breakpoint *b brp_list[brp_j].value); if (retval != ERROR_OK) return retval; - breakpoint->linked_BRP = 0; + breakpoint->linked_brp = 0; breakpoint->set = 0; return ERROR_OK; diff --git a/src/target/nds32.c b/src/target/nds32.c index add66b22f..cc6e2da44 100644 --- a/src/target/nds32.c +++ b/src/target/nds32.c @@ -1660,7 +1660,7 @@ int nds32_init_arch_info(struct target *target, struct nds32 *nds32) nds32->syscall_break.orig_instr = NULL; nds32->syscall_break.next = NULL; nds32->syscall_break.unique_id = 0x515CAll + target->target_number; - nds32->syscall_break.linked_BRP = 0; + nds32->syscall_break.linked_brp = 0; nds32_reg_init();