From: Tomas Vanek Date: Wed, 6 Feb 2019 18:07:15 +0000 (+0100) Subject: target/cortex_m: remove target halted check when removing a breakpoint X-Git-Tag: v0.11.0-rc1~771 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=d73de4c07c726fb0dc86f6ee6bac53fccbd62a87;hp=4db5299b5bd2c3e853f7383c076f9726dc588680 target/cortex_m: remove target halted check when removing a breakpoint Remove the target halted check from cortex_m_remove_breakpoint() as there is no such check in cortex_m_set_breakpoint() and bp can be safely removed from the running target. While on it return the error code from cortex_m_unset_breakpoint() to higher level. Change-Id: I2b358c3661feed84297913e9f589bdf1e4de7e64 Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/4887 Tested-by: jenkins Reviewed-by: Matthias Welwarsky Reviewed-by: Jānis Skujenieks Reviewed-by: Christopher Head --- diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 8c43016cbf..d341d45729 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -1288,16 +1288,10 @@ int cortex_m_add_breakpoint(struct target *target, struct breakpoint *breakpoint int cortex_m_remove_breakpoint(struct target *target, struct breakpoint *breakpoint) { - /* REVISIT why check? FPB can be updated with core running ... */ - if (target->state != TARGET_HALTED) { - LOG_WARNING("target not halted"); - return ERROR_TARGET_NOT_HALTED; - } - - if (breakpoint->set) - cortex_m_unset_breakpoint(target, breakpoint); + if (!breakpoint->set) + return ERROR_OK; - return ERROR_OK; + return cortex_m_unset_breakpoint(target, breakpoint); } int cortex_m_set_watchpoint(struct target *target, struct watchpoint *watchpoint)