This is an automated email from Gerrit.
"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/9124
-- gerrit
commit 5f06154c7cc904510fbb7d63934e18a2eda722e6
Author: Tomas Vanek <van...@fbl.cz>
Date: Mon May 26 09:49:18 2025 +0200
target/breakpoints: move and rename ERROR_TARGET_DUPLICATE_BREAKPOINT
New breakpoint/watchpoint related error codes were added to
breakpoint.h leaving the previously existing
ERROR_TARGET_DUPLICATE_BREAKPOINT in target.h
Move it to breakpoint.h and rename it accordingly.
Change-Id: I863fac1b830ee820b1315a62e4ffadfcbef6de06
Signed-off-by: Tomas Vanek <van...@fbl.cz>
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 71dec9d588..8cd761013f 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -54,7 +54,7 @@ static int breakpoint_add_internal(struct target *target,
*/
LOG_TARGET_ERROR(target, "Duplicate Breakpoint address:
" TARGET_ADDR_FMT " (BP %" PRIu32 ")",
address, breakpoint->unique_id);
- return ERROR_TARGET_DUPLICATE_BREAKPOINT;
+ return ERROR_BREAKPOINT_DUPLICATED;
}
breakpoint_p = &breakpoint->next;
breakpoint = breakpoint->next;
@@ -116,7 +116,7 @@ static int context_breakpoint_add_internal(struct target
*target,
*/
LOG_TARGET_ERROR(target, "Duplicate Breakpoint asid:
0x%08" PRIx32 " (BP %" PRIu32 ")",
asid, breakpoint->unique_id);
- return ERROR_TARGET_DUPLICATE_BREAKPOINT;
+ return ERROR_BREAKPOINT_DUPLICATED;
}
breakpoint_p = &breakpoint->next;
breakpoint = breakpoint->next;
@@ -166,11 +166,11 @@ static int hybrid_breakpoint_add_internal(struct target
*target,
*/
LOG_TARGET_ERROR(target, "Duplicate Hybrid Breakpoint
asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
asid, breakpoint->unique_id);
- return ERROR_TARGET_DUPLICATE_BREAKPOINT;
+ return ERROR_BREAKPOINT_DUPLICATED;
} else if ((breakpoint->address == address) &&
(breakpoint->asid == 0)) {
LOG_TARGET_ERROR(target, "Duplicate Breakpoint IVA: "
TARGET_ADDR_FMT " (BP %" PRIu32 ")",
address, breakpoint->unique_id);
- return ERROR_TARGET_DUPLICATE_BREAKPOINT;
+ return ERROR_BREAKPOINT_DUPLICATED;
}
breakpoint_p = &breakpoint->next;
diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 0789267c7d..840c051aa8 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -88,5 +88,6 @@ static inline void watchpoint_set(struct watchpoint
*watchpoint, unsigned int nu
#define ERROR_BREAKPOINT_NOT_FOUND (-1600)
#define ERROR_WATCHPOINT_NOT_FOUND (-1601)
+#define ERROR_BREAKPOINT_DUPLICATED (-1602)
#endif /* OPENOCD_TARGET_BREAKPOINTS_H */
diff --git a/src/target/target.h b/src/target/target.h
index b850b49cf3..6efcc7677b 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -791,11 +791,10 @@ int target_profiling_default(struct target *target,
uint32_t *samples, uint32_t
#define ERROR_TARGET_TRANSLATION_FAULT (-309)
#define ERROR_TARGET_NOT_RUNNING (-310)
#define ERROR_TARGET_NOT_EXAMINED (-311)
-#define ERROR_TARGET_DUPLICATE_BREAKPOINT (-312)
-#define ERROR_TARGET_ALGO_EXIT (-313)
-#define ERROR_TARGET_SIZE_NOT_SUPPORTED (-314)
-#define ERROR_TARGET_PACKING_NOT_SUPPORTED (-315)
-#define ERROR_TARGET_HALTED_DO_RESUME (-316) /* used to workaround incorrect
debug halt */
+#define ERROR_TARGET_ALGO_EXIT (-312)
+#define ERROR_TARGET_SIZE_NOT_SUPPORTED (-313)
+#define ERROR_TARGET_PACKING_NOT_SUPPORTED (-314)
+#define ERROR_TARGET_HALTED_DO_RESUME (-315) /* used to workaround incorrect
debug halt */
extern bool get_target_reset_nag(void);
--
