summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-11 11:42:33 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-11 11:42:33 +0000
commite4850d7159d557519fd012bda3bc6e9f35763689 (patch)
treeb000a50882d27cee76edb127ba8e8b923dba964a /src
parent78cf92166ad4ab67e48e5dab7307bb1cf5a345b4 (diff)
downloadopenocd+libswd-e4850d7159d557519fd012bda3bc6e9f35763689.tar.gz
openocd+libswd-e4850d7159d557519fd012bda3bc6e9f35763689.tar.bz2
openocd+libswd-e4850d7159d557519fd012bda3bc6e9f35763689.tar.xz
openocd+libswd-e4850d7159d557519fd012bda3bc6e9f35763689.zip
Simplify handle_resume_command:
- Eliminate redundant calls to target_resume with addr temp variable. - Place variables at location of first use. - Fix minor whitespace issues. git-svn-id: svn://svn.berlios.de/openocd/trunk@2191 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/target/target.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 6d4a93bc..260f9cec 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1931,21 +1931,20 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch
static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- int retval;
- target_t *target = get_current_target(cmd_ctx);
+ if (argc > 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
- target_handle_event( target, TARGET_EVENT_OLD_pre_resume );
+ target_t *target = get_current_target(cmd_ctx);
+ target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
- if (argc == 0)
- retval = target_resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */
- else if (argc == 1)
- retval = target_resume(target, 0, strtoul(args[0], NULL, 0), 1, 0); /* addr = args[0], handle breakpoints, not debugging */
- else
- {
- retval = ERROR_COMMAND_SYNTAX_ERROR;
- }
+ /* with no args, resume from current pc, addr = 0,
+ * with one arguments, addr = args[0],
+ * handle breakpoints, not debugging */
+ u32 addr = 0;
+ if (argc == 1)
+ addr = strtoul(args[0], NULL, 0);
- return retval;
+ return target_resume(target, 0, addr, 1, 0);
}
static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)