interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #969 from aap-sc/aap-sc/final_november_2023_upstream_sync_fixup 

fix erroneously-resolved merge conflict
This commit is contained in:
Tim Newsome 2023-11-30 12:18:33 -08:00 committed by GitHub
parent e9484bab54 10af616067
commit d4c5d26570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/target/breakpoints.c
View File

@ -623,7 +623,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
num_found_watchpoints++; num_found_watchpoints++;
if (status != ERROR_OK) { if (status != ERROR_OK) {
LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address); LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
retval = status; retval = status;
} }
} }
@ -635,7 +635,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
num_found_watchpoints++; num_found_watchpoints++;
if (retval != ERROR_OK) if (retval != ERROR_OK)
LOG_TARGET_ERROR(target, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address); LOG_TARGET_ERROR(target, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
} }
} }