- fixes issue with reset and arm926ejs core. Thanks Øyvind Harboe

[openocd] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 5c1f13c1cffe258fb88d433eba903b5ee71b8ac4..25df2a2b85e4048e8f209b90f9c95f881149ca51 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -313,23 +313,6 @@ int target_process_reset(struct command_context_s *cmd_ctx)
        while (target)
        {
                target->type->deassert_reset(target);
-
-               switch (target->reset_mode)
-               {
-                       case RESET_INIT:
-                       case RESET_HALT:
-                               // If we're already halted, then this is harmless(reducing # of execution paths here)
-                               // If nSRST & nTRST are tied together then the halt during reset failed(logged) and
-                               // we use this as fallback(there is no other output to tell the user that reset halt 
-                               // didn't work).
-                               target->type->poll(target);
-                               target->type->halt(target);
-                               break;
-                       default:
-                               break;
-               }
-               
-               
                target = target->next;
        }
        jtag_execute_queue();
@@ -781,7 +764,7 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32*
                size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
        {
                buffer = malloc(size);
-               if (buffer==NULL)
+               if (buffer == NULL)
                {
                        ERROR("error allocating buffer for section (%d bytes)", size);
                        return ERROR_OK;
@@ -1925,7 +1908,7 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch
        for (i = 0; i < image.num_sections; i++)
        {
                buffer = malloc(image.sections[i].size);
-               if (buffer==NULL)
+               if (buffer == NULL)
                {
                        command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size);
                        break;
@@ -2160,3 +2143,4 @@ int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args
 }
 
 
+