From 8cd3832e2b76421a955dddbe4b6199b62fed69c6 Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Thu, 13 Oct 2011 19:58:06 +0100 Subject: target: whitespace cleanup Change-Id: I1453f4f3dc0add529da20577e38b8b82d7d00366 Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/18 Reviewed-by: Alex Austin Tested-by: Spencer Oliver Reviewed-by: Spencer Oliver --- src/target/target.c | 67 +++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/target/target.c b/src/target/target.c index e03b3989..b68eee36 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -3050,42 +3050,41 @@ static int handle_bp_command_set(struct command_context *cmd_ctx, uint32_t addr, uint32_t asid, uint32_t length, int hw) { struct target *target = get_current_target(cmd_ctx); - - if (asid == 0) - { int retval = breakpoint_add(target, addr, length, hw); - if (ERROR_OK == retval) - command_print(cmd_ctx, "breakpoint set at 0x%8.8" PRIx32 "", addr); - else - { - LOG_ERROR("Failure setting breakpoint, the same address(IVA) is already used"); - return retval; - } - } - else if (addr == 0) + + if (asid == 0) + { + int retval = breakpoint_add(target, addr, length, hw); + if (ERROR_OK == retval) + command_print(cmd_ctx, "breakpoint set at 0x%8.8" PRIx32 "", addr); + else { - int retval = context_breakpoint_add(target, asid, length, hw); - if (ERROR_OK == retval) - command_print(cmd_ctx, "Context breakpoint set at 0x%8.8" PRIx32 "", asid); - else - { - LOG_ERROR("Failure setting breakpoint, the same address(CONTEXTID) is already used"); - return retval; - } + LOG_ERROR("Failure setting breakpoint, the same address(IVA) is already used"); + return retval; } + } + else if (addr == 0) + { + int retval = context_breakpoint_add(target, asid, length, hw); + if (ERROR_OK == retval) + command_print(cmd_ctx, "Context breakpoint set at 0x%8.8" PRIx32 "", asid); else - { - int retval = hybrid_breakpoint_add(target, addr, asid, length, hw); - if(ERROR_OK == retval) + { + LOG_ERROR("Failure setting breakpoint, the same address(CONTEXTID) is already used"); + return retval; + } + } + else + { + int retval = hybrid_breakpoint_add(target, addr, asid, length, hw); + if(ERROR_OK == retval) command_print(cmd_ctx, "Hybrid breakpoint set at 0x%8.8" PRIx32 "", asid); - else - { - LOG_ERROR("Failure setting breakpoint, the same address is already used"); - return retval; - } + else + { + LOG_ERROR("Failure setting breakpoint, the same address is already used"); + return retval; } + } return ERROR_OK; - - } COMMAND_HANDLER(handle_bp_command) @@ -3106,7 +3105,6 @@ COMMAND_HANDLER(handle_bp_command) return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); case 3: - if(strcmp(CMD_ARGV[2], "hw") == 0) { hw = BKPT_HARD; @@ -3132,12 +3130,11 @@ COMMAND_HANDLER(handle_bp_command) COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], asid); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], length); return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); + default: command_print(CMD_CTX, "usage: bp
[] ['hw'|'hw_ctx']"); return ERROR_COMMAND_SYNTAX_ERROR; } - - } COMMAND_HANDLER(handle_rbp_command) @@ -5108,7 +5105,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv) retval = 0; LOG_DEBUG("%d",argc); /* argv[1] = target to associate in smp - * argv[2] = target to assoicate in smp + * argv[2] = target to assoicate in smp * argv[3] ... */ @@ -5145,7 +5142,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv) target->head = head; curr=curr->next; } - return retval; + return retval; } -- cgit v1.2.3-18-g5258