Commit 8cd3832e authored by Spencer Oliver's avatar Spencer Oliver Committed by Spencer Oliver
Browse files

target: whitespace cleanup



Change-Id: I1453f4f3dc0add529da20577e38b8b82d7d00366
Signed-off-by: default avatarSpencer Oliver <ntfreak@users.sourceforge.net>
Reviewed-on: http://openocd.zylin.com/18

Reviewed-by: default avatarAlex Austin <alex.austin@spectrumdsi.com>
Tested-by: default avatarSpencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: default avatarSpencer Oliver <spen@spen-soft.co.uk>
parent 5a7cff26
...@@ -3050,42 +3050,41 @@ static int handle_bp_command_set(struct command_context *cmd_ctx, ...@@ -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) uint32_t addr, uint32_t asid, uint32_t length, int hw)
{ {
struct target *target = get_current_target(cmd_ctx); struct target *target = get_current_target(cmd_ctx);
if (asid == 0) if (asid == 0)
{ int retval = breakpoint_add(target, addr, length, hw); {
if (ERROR_OK == retval) int retval = breakpoint_add(target, addr, length, hw);
command_print(cmd_ctx, "breakpoint set at 0x%8.8" PRIx32 "", addr); if (ERROR_OK == retval)
else 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)
{ {
int retval = context_breakpoint_add(target, asid, length, hw); LOG_ERROR("Failure setting breakpoint, the same address(IVA) is already used");
if (ERROR_OK == retval) return 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;
}
} }
}
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 else
{ {
int retval = hybrid_breakpoint_add(target, addr, asid, length, hw); LOG_ERROR("Failure setting breakpoint, the same address(CONTEXTID) is already used");
if(ERROR_OK == retval) 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); command_print(cmd_ctx, "Hybrid breakpoint set at 0x%8.8" PRIx32 "", asid);
else else
{ {
LOG_ERROR("Failure setting breakpoint, the same address is already used"); LOG_ERROR("Failure setting breakpoint, the same address is already used");
return retval; return retval;
}
} }
}
return ERROR_OK; return ERROR_OK;
} }
COMMAND_HANDLER(handle_bp_command) COMMAND_HANDLER(handle_bp_command)
...@@ -3106,7 +3105,6 @@ 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); return handle_bp_command_set(CMD_CTX, addr, asid, length, hw);
case 3: case 3:
if(strcmp(CMD_ARGV[2], "hw") == 0) if(strcmp(CMD_ARGV[2], "hw") == 0)
{ {
hw = BKPT_HARD; hw = BKPT_HARD;
...@@ -3132,12 +3130,11 @@ COMMAND_HANDLER(handle_bp_command) ...@@ -3132,12 +3130,11 @@ COMMAND_HANDLER(handle_bp_command)
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], asid); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], asid);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], length); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], length);
return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); return handle_bp_command_set(CMD_CTX, addr, asid, length, hw);
default: default:
command_print(CMD_CTX, "usage: bp <address> [<asid>]<length> ['hw'|'hw_ctx']"); command_print(CMD_CTX, "usage: bp <address> [<asid>]<length> ['hw'|'hw_ctx']");
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }
} }
COMMAND_HANDLER(handle_rbp_command) COMMAND_HANDLER(handle_rbp_command)
...@@ -5108,7 +5105,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv) ...@@ -5108,7 +5105,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
retval = 0; retval = 0;
LOG_DEBUG("%d",argc); LOG_DEBUG("%d",argc);
/* argv[1] = target to associate in smp /* argv[1] = target to associate in smp
* argv[2] = target to assoicate in smp * argv[2] = target to assoicate in smp
* argv[3] ... * argv[3] ...
*/ */
...@@ -5145,7 +5142,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv) ...@@ -5145,7 +5142,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
target->head = head; target->head = head;
curr=curr->next; curr=curr->next;
} }
return retval; return retval;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment