feroceon updated w.r.t. latest arm7/9 changes

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 5bd16622f8d0a64da9042d7aa7a57623241a1330..f3051cb09e449bea8506b8cd93eb15a4ce8c6907 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -308,18 +308,6 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
                target = target->next;
        }
 
-       /* request target halt if necessary, and schedule further action */
-       target = targets;
-       while (target)
-       {
-               if (reset_mode!=RESET_RUN)
-               {
-                       if ((retval = target_halt(target))!=ERROR_OK)
-                               return retval;
-               }
-               target = target->next;
-       }
-
        target = targets;
        while (target)
        {
@@ -395,7 +383,7 @@ static int default_examine(struct target_s *target)
  *
  * XScale
  */
-int target_examine(struct command_context_s *cmd_ctx)
+int target_examine(void)
 {
        int retval = ERROR_OK;
        target_t *target = targets;
@@ -678,15 +666,15 @@ static int target_call_timer_callbacks_check_time(int checktime)
        return ERROR_OK;
 }
 
-int target_call_timer_callbacks()
+int target_call_timer_callbacks(void)
 {
        return target_call_timer_callbacks_check_time(1);
 }
 
 /* invoke periodic callbacks immediately */
-int target_call_timer_callbacks_now()
+int target_call_timer_callbacks_now(void)
 {
-       return target_call_timer_callbacks(0);
+       return target_call_timer_callbacks();
 }
 
 int target_alloc_working_area(struct target_s *target, u32 size, working_area_t **area)
@@ -1212,7 +1200,7 @@ int target_register_user_commands(struct command_context_s *cmd_ctx)
        register_command(cmd_ctx,  NULL, "halt", handle_halt_command, COMMAND_EXEC, "halt target");
        register_command(cmd_ctx,  NULL, "resume", handle_resume_command, COMMAND_EXEC, "resume target [addr]");
        register_command(cmd_ctx,  NULL, "step", handle_step_command, COMMAND_EXEC, "step one instruction from current PC or [addr]");
-       register_command(cmd_ctx,  NULL, "reset", handle_reset_command, COMMAND_EXEC, "reset target [run|halt|init]");
+       register_command(cmd_ctx,  NULL, "reset", handle_reset_command, COMMAND_EXEC, "reset target [run|halt|init] - default is run");
        register_command(cmd_ctx,  NULL, "soft_reset_halt", handle_soft_reset_halt_command, COMMAND_EXEC, "halt the target and do a soft reset");
 
        register_command(cmd_ctx,  NULL, "mdw", handle_md_command, COMMAND_EXEC, "display memory words <addr> [count]");
@@ -1713,9 +1701,7 @@ int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **ar
        }
 
        /* reset *all* targets */
-       target_process_reset(cmd_ctx, reset_mode);
-
-       return ERROR_OK;
+       return target_process_reset(cmd_ctx, reset_mode);
 }
 
 int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)