- Fixes '[|]' whitespace

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

diff --git a/src/target/target.c b/src/target/target.c
index e059861dc80203cc581741e368bc5c4325a9cfef..5433316a879eabf2cb9e1fb62c236782d51bdbaf 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -144,7 +144,7 @@ const char *target_strerror_safe( int err )
        const Jim_Nvp *n;
 
        n = Jim_Nvp_value2name_simple( nvp_error_target, err );
        const Jim_Nvp *n;
 
        n = Jim_Nvp_value2name_simple( nvp_error_target, err );

-       if( n->name == NULL ){
+       if ( n->name == NULL ){

                return "unknown";
        } else {
                return n->name;
                return "unknown";
        } else {
                return n->name;


@@ -244,9 +244,9 @@ static int max_target_number(void)
 
        x = -1;
        t = all_targets;
 
        x = -1;
        t = all_targets;

-       while( t ){
-               if( x < t->target_number ){
-                       x = (t->target_number)+1;
+       while ( t ){
+               if ( x < t->target_number ){
+                       x = (t->target_number) + 1;

                }
                t = t->next;
        }
                }
                t = t->next;
        }


@@ -262,13 +262,13 @@ static int new_target_number(void)
        /* number is 0 based */
        x = -1;
        t = all_targets;
        /* number is 0 based */
        x = -1;
        t = all_targets;

-       while(t){
-               if( x < t->target_number ){
+       while (t){
+               if ( x < t->target_number ){

                        x = t->target_number;
                }
                t = t->next;
        }
                        x = t->target_number;
                }
                t = t->next;
        }

-       return x+1;
+       return x + 1;

 }
 
 static int target_continuous_poll = 1;
 }
 
 static int target_continuous_poll = 1;


@@ -353,7 +353,7 @@ static target_t *get_target_by_num(int num)
        target_t *target = all_targets;
 
        while (target){
        target_t *target = all_targets;
 
        while (target){

-               if( target->target_number == num ){
+               if ( target->target_number == num ){

                        return target;
                }
                target = target->next;
                        return target;
                }
                target = target->next;


@@ -429,7 +429,7 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
        int retval;
        Jim_Nvp *n;
        n = Jim_Nvp_value2name_simple( nvp_reset_modes, reset_mode );
        int retval;
        Jim_Nvp *n;
        n = Jim_Nvp_value2name_simple( nvp_reset_modes, reset_mode );

-       if( n->name == NULL ){
+       if ( n->name == NULL ){

                LOG_ERROR("invalid reset mode");
                return ERROR_FAIL;
        }
                LOG_ERROR("invalid reset mode");
                return ERROR_FAIL;
        }


@@ -446,7 +446,7 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
 
        target_continuous_poll = save_poll;
 
 
        target_continuous_poll = save_poll;
 

-       if(retval != JIM_OK) {
+       if (retval != JIM_OK) {

                Jim_PrintErrorMessage(interp);
                return ERROR_FAIL;
        }
                Jim_PrintErrorMessage(interp);
                return ERROR_FAIL;
        }


@@ -492,7 +492,7 @@ static int jtag_enable_callback(enum jtag_event event, void *priv)
 }
 
 
 }
 
 

-/* Targets that correctly implement init+examine, i.e.
+/* Targets that correctly implement init + examine, i.e.

  * no communication with target during init:
  *
  * XScale
  * no communication with target during init:
  *
  * XScale


@@ -685,9 +685,9 @@ int target_init(struct command_context_s *cmd_ctx)
 
        if (all_targets)
        {
 
        if (all_targets)
        {

-               if((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
+               if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)

                        return retval;
                        return retval;

-               if((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)
+               if ((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)

                        return retval;
        }
 
                        return retval;
        }
 


@@ -983,7 +983,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
                {
                        int retval;
                        new_wa->backup = malloc(new_wa->size);
                {
                        int retval;
                        new_wa->backup = malloc(new_wa->size);

-                       if((retval = target_read_memory(target, new_wa->address, 4, new_wa->size / 4, new_wa->backup)) != ERROR_OK)
+                       if ((retval = target_read_memory(target, new_wa->address, 4, new_wa->size / 4, new_wa->backup)) != ERROR_OK)

                        {
                                free(new_wa->backup);
                                free(new_wa);
                        {
                                free(new_wa->backup);
                                free(new_wa);


@@ -1014,10 +1014,10 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar
        if (area->free)
                return ERROR_OK;
 
        if (area->free)
                return ERROR_OK;
 

-       if (restore&&target->backup_working_area)
+       if (restore && target->backup_working_area)

        {
                int retval;
        {
                int retval;

-               if((retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK)
+               if ((retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK)

                        return retval;
        }
 
                        return retval;
        }
 


@@ -1079,7 +1079,7 @@ int target_register_commands(struct command_context_s *cmd_ctx)
 int target_arch_state(struct target_s *target)
 {
        int retval;
 int target_arch_state(struct target_s *target)
 {
        int retval;

-       if (target==NULL)
+       if (target == NULL)

        {
                LOG_USER("No target has been configured");
                return ERROR_OK;
        {
                LOG_USER("No target has been configured");
                return ERROR_OK;


@@ -1088,10 +1088,10 @@ int target_arch_state(struct target_s *target)
        LOG_USER("target state: %s",
                 Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
 
        LOG_USER("target state: %s",
                 Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
 

-       if (target->state!=TARGET_HALTED)
+       if (target->state != TARGET_HALTED)

                return ERROR_OK;
 
                return ERROR_OK;
 

-       retval=target->type->arch_state(target);
+       retval = target->type->arch_state(target);

        return retval;
 }
 
        return retval;
 }
 


@@ -1118,7 +1118,7 @@ int target_write_buffer(struct target_s *target, uint32_t address, uint32_t size
        if ((address + size - 1) < address)
        {
                /* GDB can request this when e.g. PC is 0xfffffffc*/
        if ((address + size - 1) < address)
        {
                /* GDB can request this when e.g. PC is 0xfffffffc*/

-               LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", 
+               LOG_ERROR("address + size wrapped(0x%08x, 0x%08x)", 

                                  (unsigned)address, 
                                  (unsigned)size);
                return ERROR_FAIL;
                                  (unsigned)address, 
                                  (unsigned)size);
                return ERROR_FAIL;


@@ -1200,7 +1200,7 @@ int target_read_buffer(struct target_s *target, uint32_t address, uint32_t size,
        if ((address + size - 1) < address)
        {
                /* GDB can request this when e.g. PC is 0xfffffffc*/
        if ((address + size - 1) < address)
        {
                /* GDB can request this when e.g. PC is 0xfffffffc*/

-               LOG_ERROR("address+size wrapped(0x%08" PRIx32 ", 0x%08" PRIx32 ")", 
+               LOG_ERROR("address + size wrapped(0x%08" PRIx32 ", 0x%08" PRIx32 ")", 

                                  address, 
                                  size);
                return ERROR_FAIL;
                                  address, 
                                  size);
                return ERROR_FAIL;


@@ -1466,8 +1466,8 @@ int target_register_user_commands(struct command_context_s *cmd_ctx)
 
        /* script procedures */
        register_command(cmd_ctx, NULL, "profile", handle_profile_command, COMMAND_EXEC, "profiling samples the CPU PC");
 
        /* script procedures */
        register_command(cmd_ctx, NULL, "profile", handle_profile_command, COMMAND_EXEC, "profiling samples the CPU PC");

-       register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing <ARRAYNAME> <WIDTH=32/16/8> <ADDRESS> <COUNT>");
-       register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values  <ARRAYNAME> <WIDTH=32/16/8> <ADDRESS> <COUNT>");
+       register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing <ARRAYNAME> <WIDTH = 32/16/8> <ADDRESS> <COUNT>");
+       register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values  <ARRAYNAME> <WIDTH = 32/16/8> <ADDRESS> <COUNT>");

 
        register_command(cmd_ctx, NULL, "fast_load_image", handle_fast_load_image_command, COMMAND_ANY,
                        "same args as load_image, image stored in memory - mainly for profiling purposes");
 
        register_command(cmd_ctx, NULL, "fast_load_image", handle_fast_load_image_command, COMMAND_ANY,
                        "same args as load_image, image stored in memory - mainly for profiling purposes");


@@ -1483,7 +1483,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, "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] - default is run");
+       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]");
        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]");


@@ -1504,9 +1504,9 @@ int target_register_user_commands(struct command_context_s *cmd_ctx)
        register_command(cmd_ctx,  NULL, "verify_image", handle_verify_image_command, COMMAND_EXEC, "verify_image <file> [offset] [type]");
        register_command(cmd_ctx,  NULL, "test_image", handle_test_image_command, COMMAND_EXEC, "test_image <file> [offset] [type]");
 
        register_command(cmd_ctx,  NULL, "verify_image", handle_verify_image_command, COMMAND_EXEC, "verify_image <file> [offset] [type]");
        register_command(cmd_ctx,  NULL, "test_image", handle_test_image_command, COMMAND_EXEC, "test_image <file> [offset] [type]");
 

-       if((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)
+       if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)

                return retval;
                return retval;

-       if((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)
+       if ((retval = trace_register_commands(cmd_ctx)) != ERROR_OK)

                return retval;
 
        return retval;
                return retval;
 
        return retval;


@@ -1584,7 +1584,7 @@ static int sense_handler(void)
        static int prevPowerdropout = 0;
 
        int retval;
        static int prevPowerdropout = 0;
 
        int retval;

-       if ((retval=jtag_power_dropout(&powerDropout))!=ERROR_OK)
+       if ((retval = jtag_power_dropout(&powerDropout)) != ERROR_OK)

                return retval;
 
        int powerRestored;
                return retval;
 
        int powerRestored;


@@ -1603,7 +1603,7 @@ static int sense_handler(void)
                lastPower = current;
        }
 
                lastPower = current;
        }
 

-       if ((retval=jtag_srst_asserted(&srstAsserted))!=ERROR_OK)
+       if ((retval = jtag_srst_asserted(&srstAsserted)) != ERROR_OK)

                return retval;
 
        int srstDeasserted;
                return retval;
 
        int srstDeasserted;


@@ -1681,10 +1681,10 @@ int handle_target(void *priv)
 
                /* clear action flags */
 
 
                /* clear action flags */
 

-               runSrstAsserted=0;
-               runSrstDeasserted=0;
-               runPowerRestore=0;
-               runPowerDropout=0;
+               runSrstAsserted = 0;
+               runSrstDeasserted = 0;
+               runPowerRestore = 0;
+               runPowerDropout = 0;

 
                recursive = 0;
        }
 
                recursive = 0;
        }


@@ -1703,7 +1703,7 @@ int handle_target(void *priv)
                if (!powerDropout && !srstAsserted)
                {
                        /* polling may fail silently until the target has been examined */
                if (!powerDropout && !srstAsserted)
                {
                        /* polling may fail silently until the target has been examined */

-                       if((retval = target_poll(target)) != ERROR_OK)
+                       if ((retval = target_poll(target)) != ERROR_OK)

                                return retval;
                }
        }
                                return retval;
                }
        }


@@ -1728,7 +1728,7 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
                reg_cache_t *cache = target->reg_cache;
 
                count = 0;
                reg_cache_t *cache = target->reg_cache;
 
                count = 0;

-               while(cache)
+               while (cache)

                {
                        int i;
                        for (i = 0; i < cache->num_regs; i++)
                {
                        int i;
                        for (i = 0; i < cache->num_regs; i++)


@@ -1759,7 +1759,7 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
 
                reg_cache_t *cache = target->reg_cache;
                count = 0;
 
                reg_cache_t *cache = target->reg_cache;
                count = 0;

-               while(cache)
+               while (cache)

                {
                        int i;
                        for (i = 0; i < cache->num_regs; i++)
                {
                        int i;
                        for (i = 0; i < cache->num_regs; i++)


@@ -1851,7 +1851,7 @@ static int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, cha
                        return retval;
 
        }
                        return retval;
 
        }

-       else if (argc==1)
+       else if (argc == 1)

        {
                if (strcmp(args[0], "on") == 0)
                {
        {
                if (strcmp(args[0], "on") == 0)
                {


@@ -1904,12 +1904,12 @@ static int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd
 int target_wait_state(target_t *target, enum target_state state, int ms)
 {
        int retval;
 int target_wait_state(target_t *target, enum target_state state, int ms)
 {
        int retval;

-       long long then=0, cur;
-       int once=1;
+       long long then = 0, cur;
+       int once = 1;

 
        for (;;)
        {
 
        for (;;)
        {

-               if ((retval=target_poll(target))!=ERROR_OK)
+               if ((retval = target_poll(target)) != ERROR_OK)

                        return retval;
                if (target->state == state)
                {
                        return retval;
                if (target->state == state)
                {


@@ -1918,7 +1918,7 @@ int target_wait_state(target_t *target, enum target_state state, int ms)
                cur = timeval_ms();
                if (once)
                {
                cur = timeval_ms();
                if (once)
                {

-                       once=0;
+                       once = 0;

                        then = timeval_ms();
                        LOG_DEBUG("waiting for target %s...",
                                Jim_Nvp_value2name_simple(nvp_target_state,state)->name);
                        then = timeval_ms();
                        LOG_DEBUG("waiting for target %s...",
                                Jim_Nvp_value2name_simple(nvp_target_state,state)->name);


@@ -1983,7 +1983,7 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch
        {
                const Jim_Nvp *n;
                n = Jim_Nvp_name2value_simple( nvp_reset_modes, args[0] );
        {
                const Jim_Nvp *n;
                n = Jim_Nvp_name2value_simple( nvp_reset_modes, args[0] );

-               if( (n->name == NULL) || (n->value == RESET_UNKNOWN) ){
+               if ( (n->name == NULL) || (n->value == RESET_UNKNOWN) ){

                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
                reset_mode = n->value;
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
                reset_mode = n->value;


@@ -1996,6 +1996,7 @@ 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)
 {
 
 static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {

+       int current = 1;

        if (argc > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (argc > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 


@@ -2011,9 +2012,10 @@ static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, c
                int retval = parse_u32(args[0], &addr);
                if (ERROR_OK != retval)
                        return retval;
                int retval = parse_u32(args[0], &addr);
                if (ERROR_OK != retval)
                        return retval;

+               current = 0;

        }
 
        }
 

-       return target_resume(target, 0, addr, 1, 0);
+       return target_resume(target, current, addr, 1, 0);

 }
 
 static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 }
 
 static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)


@@ -2068,7 +2070,7 @@ static void handle_md_output(struct command_context_s *cmd_ctx,
                                        (unsigned)(address + (i*size)));
                }
 
                                        (unsigned)(address + (i*size)));
                }
 

-               uint32_t value=0;
+               uint32_t value = 0;

                const uint8_t *value_ptr = buffer + i * size;
                switch (size) {
                case 4: value = target_buffer_get_u32(target, value_ptr); break;
                const uint8_t *value_ptr = buffer + i * size;
                switch (size) {
                case 4: value = target_buffer_get_u32(target, value_ptr); break;


@@ -2272,27 +2274,27 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
                        break;
                }
 
                        break;
                }
 

-               uint32_t offset=0;
-               uint32_t length=buf_cnt;
+               uint32_t offset = 0;
+               uint32_t length = buf_cnt;

 
                /* DANGER!!! beware of unsigned comparision here!!! */
 
 
                /* DANGER!!! beware of unsigned comparision here!!! */
 

-               if ((image.sections[i].base_address+buf_cnt>=min_address)&&
+               if ((image.sections[i].base_address + buf_cnt >= min_address)&&

                                (image.sections[i].base_address<max_address))
                {
                        if (image.sections[i].base_address<min_address)
                        {
                                /* clip addresses below */
                                (image.sections[i].base_address<max_address))
                {
                        if (image.sections[i].base_address<min_address)
                        {
                                /* clip addresses below */

-                               offset+=min_address-image.sections[i].base_address;
-                               length-=offset;
+                               offset += min_address-image.sections[i].base_address;
+                               length -= offset;

                        }
 
                        }
 

-                       if (image.sections[i].base_address+buf_cnt>max_address)
+                       if (image.sections[i].base_address + buf_cnt>max_address)

                        {
                        {

-                               length-=(image.sections[i].base_address+buf_cnt)-max_address;
+                               length -= (image.sections[i].base_address + buf_cnt)-max_address;

                        }
 
                        }
 

-                       if ((retval = target_write_buffer(target, image.sections[i].base_address+offset, length, buffer+offset)) != ERROR_OK)
+                       if ((retval = target_write_buffer(target, image.sections[i].base_address + offset, length, buffer + offset)) != ERROR_OK)

                        {
                                free(buffer);
                                break;
                        {
                                free(buffer);
                                break;


@@ -2300,19 +2302,19 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
                        image_size += length;
                        command_print(cmd_ctx, "%u byte written at address 0x%8.8" PRIx32 "", 
                                                  (unsigned int)length, 
                        image_size += length;
                        command_print(cmd_ctx, "%u byte written at address 0x%8.8" PRIx32 "", 
                                                  (unsigned int)length, 

-                                                 image.sections[i].base_address+offset);
+                                                 image.sections[i].base_address + offset);

                }
 
                free(buffer);
        }
 
                }
 
                free(buffer);
        }
 

-       if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+       if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)

        {
                image_close(&image);
                return retvaltemp;
        }
 
        {
                image_close(&image);
                return retvaltemp;
        }
 

-       if (retval==ERROR_OK)
+       if (retval == ERROR_OK)

        {
                command_print(cmd_ctx, "downloaded %u byte in %s", 
                                          (unsigned int)image_size, 
        {
                command_print(cmd_ctx, "downloaded %u byte in %s", 
                                          (unsigned int)image_size, 


@@ -2382,13 +2384,13 @@ static int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cm
                address += this_run_size;
        }
 
                address += this_run_size;
        }
 

-       if((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
+       if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)

                return retvaltemp;
 
                return retvaltemp;
 

-       if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+       if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)

                return retvaltemp;
 
                return retvaltemp;
 

-       if (retval==ERROR_OK)
+       if (retval == ERROR_OK)

        {
                command_print(cmd_ctx, "dumped %lld byte in %s",
                                fileio.size, duration_text);
        {
                command_print(cmd_ctx, "dumped %lld byte in %s",
                                fileio.size, duration_text);


@@ -2445,13 +2447,13 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
 
        image.start_address_set = 0;
 
 
        image.start_address_set = 0;
 

-       if ((retval=image_open(&image, args[0], (argc == 3) ? args[2] : NULL)) != ERROR_OK)
+       if ((retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL)) != ERROR_OK)

        {
                return retval;
        }
 
        image_size = 0x0;
        {
                return retval;
        }
 
        image_size = 0x0;

-       retval=ERROR_OK;
+       retval = ERROR_OK;

        for (i = 0; i < image.num_sections; i++)
        {
                buffer = malloc(image.sections[i].size);
        for (i = 0; i < image.num_sections; i++)
        {
                buffer = malloc(image.sections[i].size);


@@ -2474,13 +2476,13 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
                        image_calculate_checksum( buffer, buf_cnt, &checksum );
 
                        retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum);
                        image_calculate_checksum( buffer, buf_cnt, &checksum );
 
                        retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum);

-                       if( retval != ERROR_OK )
+                       if ( retval != ERROR_OK )

                        {
                                free(buffer);
                                break;
                        }
 
                        {
                                free(buffer);
                                break;
                        }
 

-                       if( checksum != mem_checksum )
+                       if ( checksum != mem_checksum )

                        {
                                /* failed crc checksum, fall back to a binary compare */
                                uint8_t *data;
                        {
                                /* failed crc checksum, fall back to a binary compare */
                                uint8_t *data;


@@ -2512,10 +2514,10 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
                                                                                  buffer[t]);
                                                        free(data);
                                                        free(buffer);
                                                                                  buffer[t]);
                                                        free(data);
                                                        free(buffer);

-                                                       retval=ERROR_FAIL;
+                                                       retval = ERROR_FAIL;

                                                        goto done;
                                                }
                                                        goto done;
                                                }

-                                               if ((t%16384)==0)
+                                               if ((t%16384) == 0)

                                                {
                                                        keep_alive();
                                                }
                                                {
                                                        keep_alive();
                                                }


@@ -2536,13 +2538,13 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
        }
 done:
 
        }
 done:
 

-       if((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+       if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)

        {
                image_close(&image);
                return retvaltemp;
        }
 
        {
                image_close(&image);
                return retvaltemp;
        }
 

-       if (retval==ERROR_OK)
+       if (retval == ERROR_OK)

        {
                command_print(cmd_ctx, "verified %u bytes in %s", 
                                          (unsigned int)image_size, 
        {
                command_print(cmd_ctx, "verified %u bytes in %s", 
                                          (unsigned int)image_size, 


@@ -2697,7 +2699,7 @@ static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char
                        return retval;
                // fall through
        case 3:
                        return retval;
                // fall through
        case 3:

-               switch(args[2][0])
+               switch (args[2][0])

                {
                case 'r':
                        type = WPT_READ;
                {
                case 'r':
                        type = WPT_READ;


@@ -2788,9 +2790,9 @@ static void writeData(FILE *f, const void *data, size_t len)
 static void writeLong(FILE *f, int l)
 {
        int i;
 static void writeLong(FILE *f, int l)
 {
        int i;

-       for (i=0; i<4; i++)
+       for (i = 0; i<4; i++)

        {
        {

-               char c=(l>>(i*8))&0xff;
+               char c = (l >> (i*8))&0xff;

                writeData(f, &c, 1);
        }
 
                writeData(f, &c, 1);
        }
 


@@ -2805,8 +2807,8 @@ static void writeString(FILE *f, char *s)
 static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
 {
        uint32_t i;
 static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
 {
        uint32_t i;

-       FILE *f=fopen(filename, "w");
-       if (f==NULL)
+       FILE *f = fopen(filename, "w");
+       if (f == NULL)

                return;
        writeString(f, "gmon");
        writeLong(f, 0x00000001); /* Version */
                return;
        writeString(f, "gmon");
        writeLong(f, 0x00000001); /* Version */


@@ -2818,42 +2820,42 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
        writeData(f, &zero, 1);
 
        /* figure out bucket size */
        writeData(f, &zero, 1);
 
        /* figure out bucket size */

-       uint32_t min=samples[0];
-       uint32_t max=samples[0];
-       for (i=0; i<sampleNum; i++)
+       uint32_t min = samples[0];
+       uint32_t max = samples[0];
+       for (i = 0; i<sampleNum; i++)

        {
                if (min>samples[i])
                {
        {
                if (min>samples[i])
                {

-                       min=samples[i];
+                       min = samples[i];

                }
                if (max<samples[i])
                {
                }
                if (max<samples[i])
                {

-                       max=samples[i];
+                       max = samples[i];

                }
        }
 
                }
        }
 

-       int addressSpace=(max-min+1);
+       int addressSpace = (max-min + 1);

 
        static const uint32_t maxBuckets = 256 * 1024; /* maximum buckets. */
        uint32_t length = addressSpace;
        if (length > maxBuckets)
        {
 
        static const uint32_t maxBuckets = 256 * 1024; /* maximum buckets. */
        uint32_t length = addressSpace;
        if (length > maxBuckets)
        {

-               length=maxBuckets;
+               length = maxBuckets;

        }
        }

-       int *buckets=malloc(sizeof(int)*length);
-       if (buckets==NULL)
+       int *buckets = malloc(sizeof(int)*length);
+       if (buckets == NULL)

        {
                fclose(f);
                return;
        }
        memset(buckets, 0, sizeof(int)*length);
        {
                fclose(f);
                return;
        }
        memset(buckets, 0, sizeof(int)*length);

-       for (i=0; i<sampleNum;i++)
+       for (i = 0; i<sampleNum;i++)

        {
        {

-               uint32_t address=samples[i];
-               long long a=address-min;
-               long long b=length-1;
-               long long c=addressSpace-1;
-               int index=(a*b)/c; /* danger!!!! int32 overflows */
+               uint32_t address = samples[i];
+               long long a = address-min;
+               long long b = length-1;
+               long long c = addressSpace-1;
+               int index = (a*b)/c; /* danger!!!! int32 overflows */

                buckets[index]++;
        }
 
                buckets[index]++;
        }
 


@@ -2863,25 +2865,25 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
        writeLong(f, length);           /* # of samples */
        writeLong(f, 64000000);         /* 64MHz */
        writeString(f, "seconds");
        writeLong(f, length);           /* # of samples */
        writeLong(f, 64000000);         /* 64MHz */
        writeString(f, "seconds");

-       for (i=0; i<(15-strlen("seconds")); i++)
+       for (i = 0; i<(15-strlen("seconds")); i++)

                writeData(f, &zero, 1);
        writeString(f, "s");
 
        /*append binary memory gmon.out profile_hist_data (profile_hist_data + profile_hist_hdr.hist_size) */
 
                writeData(f, &zero, 1);
        writeString(f, "s");
 
        /*append binary memory gmon.out profile_hist_data (profile_hist_data + profile_hist_hdr.hist_size) */
 

-       char *data=malloc(2*length);
-       if (data!=NULL)
+       char *data = malloc(2*length);
+       if (data != NULL)

        {
        {

-               for (i=0; i<length;i++)
+               for (i = 0; i<length;i++)

                {
                        int val;
                {
                        int val;

-                       val=buckets[i];
+                       val = buckets[i];

                        if (val>65535)
                        {
                        if (val>65535)
                        {

-                               val=65535;
+                               val = 65535;

                        }
                        data[i*2]=val&0xff;
                        }
                        data[i*2]=val&0xff;

-                       data[i*2+1]=(val>>8)&0xff;
+                       data[i*2 + 1]=(val >> 8)&0xff;

                }
                free(buckets);
                writeData(f, data, length * 2);
                }
                free(buckets);
                writeData(f, data, length * 2);


@@ -2901,7 +2903,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
        struct timeval timeout, now;
 
        gettimeofday(&timeout, NULL);
        struct timeval timeout, now;
 
        gettimeofday(&timeout, NULL);

-       if (argc!=2)
+       if (argc != 2)

        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }


@@ -2914,12 +2916,12 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
 
        command_print(cmd_ctx, "Starting profiling. Halting and resuming the target as often as we can...");
 
 
        command_print(cmd_ctx, "Starting profiling. Halting and resuming the target as often as we can...");
 

-       static const int maxSample=10000;
-       uint32_t *samples=malloc(sizeof(uint32_t)*maxSample);
-       if (samples==NULL)
+       static const int maxSample = 10000;
+       uint32_t *samples = malloc(sizeof(uint32_t)*maxSample);
+       if (samples == NULL)

                return ERROR_OK;
 
                return ERROR_OK;
 

-       int numSamples=0;
+       int numSamples = 0;

        /* hopefully it is safe to cache! We want to stop/restart as quickly as possible. */
        reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
 
        /* hopefully it is safe to cache! We want to stop/restart as quickly as possible. */
        reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
 


@@ -2936,7 +2938,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                } else if (target->state == TARGET_RUNNING)
                {
                        /* We want to quickly sample the PC. */
                } else if (target->state == TARGET_RUNNING)
                {
                        /* We want to quickly sample the PC. */

-                       if((retval = target_halt(target)) != ERROR_OK)
+                       if ((retval = target_halt(target)) != ERROR_OK)

                        {
                                free(samples);
                                return retval;
                        {
                                free(samples);
                                return retval;


@@ -2944,19 +2946,19 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                } else
                {
                        command_print(cmd_ctx, "Target not halted or running");
                } else
                {
                        command_print(cmd_ctx, "Target not halted or running");

-                       retval=ERROR_OK;
+                       retval = ERROR_OK;

                        break;
                }
                        break;
                }

-               if (retval!=ERROR_OK)
+               if (retval != ERROR_OK)

                {
                        break;
                }
 
                gettimeofday(&now, NULL);
                {
                        break;
                }
 
                gettimeofday(&now, NULL);

-               if ((numSamples>=maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
+               if ((numSamples >= maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))

                {
                        command_print(cmd_ctx, "Profiling completed. %d samples.", numSamples);
                {
                        command_print(cmd_ctx, "Profiling completed. %d samples.", numSamples);

-                       if((retval = target_poll(target)) != ERROR_OK)
+                       if ((retval = target_poll(target)) != ERROR_OK)

                        {
                                free(samples);
                                return retval;
                        {
                                free(samples);
                                return retval;


@@ -2965,7 +2967,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                        {
                                target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
                        }
                        {
                                target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */
                        }

-                       if((retval = target_poll(target)) != ERROR_OK)
+                       if ((retval = target_poll(target)) != ERROR_OK)

                        {
                                free(samples);
                                return retval;
                        {
                                free(samples);
                                return retval;


@@ -3026,7 +3028,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                return JIM_ERR;
        }
 
                return JIM_ERR;
        }
 

-       return  target_mem2array(interp, target, argc-1, argv+1);
+       return  target_mem2array(interp, target, argc-1, argv + 1);

 }
 
 static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)
 }
 
 static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)


@@ -3213,7 +3215,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                return JIM_ERR;
        }
 
                return JIM_ERR;
        }
 

-       return target_array2mem( interp,target, argc-1, argv+1 );
+       return target_array2mem( interp,target, argc-1, argv + 1 );

 }
 
 static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)
 }
 
 static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)


@@ -3376,8 +3378,8 @@ void target_handle_event( target_t *target, enum target_event e )
        teap = target->event_action;
 
        done = 0;
        teap = target->event_action;
 
        done = 0;

-       while( teap ){
-               if( teap->event == e ){
+       while ( teap ){
+               if ( teap->event == e ){

                        done = 1;
                        LOG_DEBUG( "target: (%d) %s (%s) event: %d (%s) action: %s\n",
                                           target->target_number,
                        done = 1;
                        LOG_DEBUG( "target: (%d) %s (%s) event: %d (%s) action: %s\n",
                                           target->target_number,


@@ -3386,14 +3388,14 @@ void target_handle_event( target_t *target, enum target_event e )
                                           e,
                                           Jim_Nvp_value2name_simple( nvp_target_event, e )->name,
                                           Jim_GetString( teap->body, NULL ) );
                                           e,
                                           Jim_Nvp_value2name_simple( nvp_target_event, e )->name,
                                           Jim_GetString( teap->body, NULL ) );

-                       if (Jim_EvalObj( interp, teap->body )!=JIM_OK)
+                       if (Jim_EvalObj( interp, teap->body ) != JIM_OK)

                        {
                                Jim_PrintErrorMessage(interp);
                        }
                }
                teap = teap->next;
        }
                        {
                                Jim_PrintErrorMessage(interp);
                        }
                }
                teap = teap->next;
        }

-       if( !done ){
+       if ( !done ){

                LOG_DEBUG( "event: %d %s - no action",
                                   e,
                                   Jim_Nvp_value2name_simple( nvp_target_event, e )->name );
                LOG_DEBUG( "event: %d %s - no action",
                                   e,
                                   Jim_Nvp_value2name_simple( nvp_target_event, e )->name );


@@ -3435,38 +3437,38 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
        int e;
 
        /* parse config or cget options ... */
        int e;
 
        /* parse config or cget options ... */

-       while( goi->argc > 0 ){
+       while ( goi->argc > 0 ){

                Jim_SetEmptyResult( goi->interp );
                /* Jim_GetOpt_Debug( goi ); */
 
                Jim_SetEmptyResult( goi->interp );
                /* Jim_GetOpt_Debug( goi ); */
 

-               if( target->type->target_jim_configure ){
+               if ( target->type->target_jim_configure ){

                        /* target defines a configure function */
                        /* target gets first dibs on parameters */
                        e = (*(target->type->target_jim_configure))( target, goi );
                        /* target defines a configure function */
                        /* target gets first dibs on parameters */
                        e = (*(target->type->target_jim_configure))( target, goi );

-                       if( e == JIM_OK ){
+                       if ( e == JIM_OK ){

                                /* more? */
                                continue;
                        }
                                /* more? */
                                continue;
                        }

-                       if( e == JIM_ERR ){
+                       if ( e == JIM_ERR ){

                                /* An error */
                                return e;
                        }
                        /* otherwise we 'continue' below */
                }
                e = Jim_GetOpt_Nvp( goi, nvp_config_opts, &n );
                                /* An error */
                                return e;
                        }
                        /* otherwise we 'continue' below */
                }
                e = Jim_GetOpt_Nvp( goi, nvp_config_opts, &n );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        Jim_GetOpt_NvpUnknown( goi, nvp_config_opts, 0 );
                        return e;
                }
                        Jim_GetOpt_NvpUnknown( goi, nvp_config_opts, 0 );
                        return e;
                }

-               switch( n->value ){
+               switch ( n->value ){

                case TCFG_TYPE:
                        /* not setable */
                case TCFG_TYPE:
                        /* not setable */

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                Jim_SetResult_sprintf( goi->interp, "not setable: %s", n->name );
                                return JIM_ERR;
                        } else {
                        no_params:
                                Jim_SetResult_sprintf( goi->interp, "not setable: %s", n->name );
                                return JIM_ERR;
                        } else {
                        no_params:

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "NO PARAMS");
                                        return JIM_ERR;
                                }
                                        Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "NO PARAMS");
                                        return JIM_ERR;
                                }


@@ -3475,24 +3477,24 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        /* loop for more */
                        break;
                case TCFG_EVENT:
                        /* loop for more */
                        break;
                case TCFG_EVENT:

-                       if( goi->argc == 0 ){
+                       if ( goi->argc == 0 ){

                                Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
                                return JIM_ERR;
                        }
 
                        e = Jim_GetOpt_Nvp( goi, nvp_target_event, &n );
                                Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
                                return JIM_ERR;
                        }
 
                        e = Jim_GetOpt_Nvp( goi, nvp_target_event, &n );

-                       if( e != JIM_OK ){
+                       if ( e != JIM_OK ){

                                Jim_GetOpt_NvpUnknown( goi, nvp_target_event, 1 );
                                return e;
                        }
 
                                Jim_GetOpt_NvpUnknown( goi, nvp_target_event, 1 );
                                return e;
                        }
 

-                       if( goi->isconfigure ){
-                               if( goi->argc != 1 ){
+                       if ( goi->isconfigure ){
+                               if ( goi->argc != 1 ){

                                        Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
                                        return JIM_ERR;
                                }
                        } else {
                                        Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
                                        return JIM_ERR;
                                }
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name?");
                                        return JIM_ERR;
                                }
                                        Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name?");
                                        return JIM_ERR;
                                }


@@ -3503,21 +3505,21 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
 
                                teap = target->event_action;
                                /* replace existing? */
 
                                teap = target->event_action;
                                /* replace existing? */

-                               while( teap ){
-                                       if( teap->event == (enum target_event)n->value ){
+                               while ( teap ){
+                                       if ( teap->event == (enum target_event)n->value ){

                                                break;
                                        }
                                        teap = teap->next;
                                }
 
                                                break;
                                        }
                                        teap = teap->next;
                                }
 

-                               if( goi->isconfigure ){
-                                       if( teap == NULL ){
+                               if ( goi->isconfigure ){
+                                       if ( teap == NULL ){

                                                /* create new */
                                                teap = calloc( 1, sizeof(*teap) );
                                        }
                                        teap->event = n->value;
                                        Jim_GetOpt_Obj( goi, &o );
                                                /* create new */
                                                teap = calloc( 1, sizeof(*teap) );
                                        }
                                        teap->event = n->value;
                                        Jim_GetOpt_Obj( goi, &o );

-                                       if( teap->body ){
+                                       if ( teap->body ){

                                                Jim_DecrRefCount( interp, teap->body );
                                        }
                                        teap->body  = Jim_DuplicateObj( goi->interp, o );
                                                Jim_DecrRefCount( interp, teap->body );
                                        }
                                        teap->body  = Jim_DuplicateObj( goi->interp, o );


@@ -3539,7 +3541,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                                        Jim_SetEmptyResult(goi->interp);
                                } else {
                                        /* get */
                                        Jim_SetEmptyResult(goi->interp);
                                } else {
                                        /* get */

-                                       if( teap == NULL ){
+                                       if ( teap == NULL ){

                                                Jim_SetEmptyResult( goi->interp );
                                        } else {
                                                Jim_SetResult( goi->interp, Jim_DuplicateObj( goi->interp, teap->body ) );
                                                Jim_SetEmptyResult( goi->interp );
                                        } else {
                                                Jim_SetResult( goi->interp, Jim_DuplicateObj( goi->interp, teap->body ) );


@@ -3550,15 +3552,15 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        break;
 
                case TCFG_WORK_AREA_VIRT:
                        break;
 
                case TCFG_WORK_AREA_VIRT:

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );

-                               if( e != JIM_OK ){
+                               if ( e != JIM_OK ){

                                        return e;
                                }
                                target->working_area_virt = w;
                        } else {
                                        return e;
                                }
                                target->working_area_virt = w;
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                                        goto no_params;
                                }
                        }


@@ -3567,15 +3569,15 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        break;
 
                case TCFG_WORK_AREA_PHYS:
                        break;
 
                case TCFG_WORK_AREA_PHYS:

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );

-                               if( e != JIM_OK ){
+                               if ( e != JIM_OK ){

                                        return e;
                                }
                                target->working_area_phys = w;
                        } else {
                                        return e;
                                }
                                target->working_area_phys = w;
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                                        goto no_params;
                                }
                        }


@@ -3584,15 +3586,15 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        break;
 
                case TCFG_WORK_AREA_SIZE:
                        break;
 
                case TCFG_WORK_AREA_SIZE:

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );

-                               if( e != JIM_OK ){
+                               if ( e != JIM_OK ){

                                        return e;
                                }
                                target->working_area_size = w;
                        } else {
                                        return e;
                                }
                                target->working_area_size = w;
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                                        goto no_params;
                                }
                        }


@@ -3601,16 +3603,16 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        break;
 
                case TCFG_WORK_AREA_BACKUP:
                        break;
 
                case TCFG_WORK_AREA_BACKUP:

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Wide( goi, &w );

-                               if( e != JIM_OK ){
+                               if ( e != JIM_OK ){

                                        return e;
                                }
                                /* make this exactly 1 or 0 */
                                target->backup_working_area = (!!w);
                        } else {
                                        return e;
                                }
                                /* make this exactly 1 or 0 */
                                target->backup_working_area = (!!w);
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                                        goto no_params;
                                }
                        }


@@ -3619,20 +3621,20 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        break;
 
                case TCFG_ENDIAN:
                        break;
 
                case TCFG_ENDIAN:

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                e = Jim_GetOpt_Nvp( goi, nvp_target_endian, &n );
                                e = Jim_GetOpt_Nvp( goi, nvp_target_endian, &n );

-                               if( e != JIM_OK ){
+                               if ( e != JIM_OK ){

                                        Jim_GetOpt_NvpUnknown( goi, nvp_target_endian, 1 );
                                        return e;
                                }
                                target->endianness = n->value;
                        } else {
                                        Jim_GetOpt_NvpUnknown( goi, nvp_target_endian, 1 );
                                        return e;
                                }
                                target->endianness = n->value;
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                        n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
                                        goto no_params;
                                }
                        }
                        n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );

-                       if( n->name == NULL ){
+                       if ( n->name == NULL ){

                                target->endianness = TARGET_LITTLE_ENDIAN;
                                n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
                        }
                                target->endianness = TARGET_LITTLE_ENDIAN;
                                n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness );
                        }


@@ -3641,20 +3643,20 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        break;
 
                case TCFG_VARIANT:
                        break;
 
                case TCFG_VARIANT:

-                       if( goi->isconfigure ){
-                               if( goi->argc < 1 ){
+                       if ( goi->isconfigure ){
+                               if ( goi->argc < 1 ){

                                        Jim_SetResult_sprintf( goi->interp,
                                                                                   "%s ?STRING?",
                                                                                   n->name );
                                        return JIM_ERR;
                                }
                                        Jim_SetResult_sprintf( goi->interp,
                                                                                   "%s ?STRING?",
                                                                                   n->name );
                                        return JIM_ERR;
                                }

-                               if( target->variant ){
+                               if ( target->variant ){

                                        free((void *)(target->variant));
                                }
                                e = Jim_GetOpt_String( goi, &cp, NULL );
                                target->variant = strdup(cp);
                        } else {
                                        free((void *)(target->variant));
                                }
                                e = Jim_GetOpt_String( goi, &cp, NULL );
                                target->variant = strdup(cp);
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                                        goto no_params;
                                }
                        }


@@ -3662,22 +3664,22 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        /* loop for more */
                        break;
                case TCFG_CHAIN_POSITION:
                        /* loop for more */
                        break;
                case TCFG_CHAIN_POSITION:

-                       if( goi->isconfigure ){
+                       if ( goi->isconfigure ){

                                Jim_Obj *o;
                                jtag_tap_t *tap;
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Obj( goi, &o );
                                Jim_Obj *o;
                                jtag_tap_t *tap;
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Obj( goi, &o );

-                               if( e != JIM_OK ){
+                               if ( e != JIM_OK ){

                                        return e;
                                }
                                tap = jtag_tap_by_jim_obj( goi->interp, o );
                                        return e;
                                }
                                tap = jtag_tap_by_jim_obj( goi->interp, o );

-                               if( tap == NULL ){
+                               if ( tap == NULL ){

                                        return JIM_ERR;
                                }
                                /* make this exactly 1 or 0 */
                                target->tap = tap;
                        } else {
                                        return JIM_ERR;
                                }
                                /* make this exactly 1 or 0 */
                                target->tap = tap;
                        } else {

-                               if( goi->argc != 0 ){
+                               if ( goi->argc != 0 ){

                                        goto no_params;
                                }
                        }
                                        goto no_params;
                                }
                        }


@@ -3685,7 +3687,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
                        /* loop for more e*/
                        break;
                }
                        /* loop for more e*/
                        break;
                }

-       } /* while( goi->argc ) */
+       } /* while ( goi->argc ) */

 
 
                /* done - we return */
 
 
                /* done - we return */


@@ -3747,23 +3749,23 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
        };
 
        /* go past the "command" */
        };
 
        /* go past the "command" */

-       Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 );
+       Jim_GetOpt_Setup( &goi, interp, argc-1, argv + 1 );

 
        target = Jim_CmdPrivData( goi.interp );
        cmd_ctx = Jim_GetAssocData(goi.interp, "context");
 
        /* commands here are in an NVP table */
        e = Jim_GetOpt_Nvp( &goi, target_options, &n );
 
        target = Jim_CmdPrivData( goi.interp );
        cmd_ctx = Jim_GetAssocData(goi.interp, "context");
 
        /* commands here are in an NVP table */
        e = Jim_GetOpt_Nvp( &goi, target_options, &n );

-       if( e != JIM_OK ){
+       if ( e != JIM_OK ){

                Jim_GetOpt_NvpUnknown( &goi, target_options, 0 );
                return e;
        }
        /* Assume blank result */
        Jim_SetEmptyResult( goi.interp );
 
                Jim_GetOpt_NvpUnknown( &goi, target_options, 0 );
                return e;
        }
        /* Assume blank result */
        Jim_SetEmptyResult( goi.interp );
 

-       switch( n->value ){
+       switch ( n->value ){

        case TS_CMD_CONFIGURE:
        case TS_CMD_CONFIGURE:

-               if( goi.argc < 2 ){
+               if ( goi.argc < 2 ){

                        Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
                        return JIM_ERR;
                }
                        Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
                        return JIM_ERR;
                }


@@ -3771,7 +3773,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                return target_configure( &goi, target );
        case TS_CMD_CGET:
                // some things take params
                return target_configure( &goi, target );
        case TS_CMD_CGET:
                // some things take params

-               if( goi.argc < 1 ){
+               if ( goi.argc < 1 ){

                        Jim_WrongNumArgs( goi.interp, 0, goi.argv, "missing: ?-option?");
                        return JIM_ERR;
                }
                        Jim_WrongNumArgs( goi.interp, 0, goi.argv, "missing: ?-option?");
                        return JIM_ERR;
                }


@@ -3787,7 +3789,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                 * argv[3] = optional count.
                 */
 
                 * argv[3] = optional count.
                 */
 

-               if( (goi.argc == 2) || (goi.argc == 3) ){
+               if ( (goi.argc == 2) || (goi.argc == 3) ){

                        /* all is well */
                } else {
                mwx_error:
                        /* all is well */
                } else {
                mwx_error:


@@ -3796,24 +3798,24 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                }
 
                e = Jim_GetOpt_Wide( &goi, &a );
                }
 
                e = Jim_GetOpt_Wide( &goi, &a );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        goto mwx_error;
                }
 
                e = Jim_GetOpt_Wide( &goi, &b );
                        goto mwx_error;
                }
 
                e = Jim_GetOpt_Wide( &goi, &b );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        goto mwx_error;
                }
                if (goi.argc == 3) {
                        e = Jim_GetOpt_Wide( &goi, &c );
                        goto mwx_error;
                }
                if (goi.argc == 3) {
                        e = Jim_GetOpt_Wide( &goi, &c );

-                       if( e != JIM_OK ){
+                       if ( e != JIM_OK ){

                                goto mwx_error;
                        }
                } else {
                        c = 1;
                }
 
                                goto mwx_error;
                        }
                } else {
                        c = 1;
                }
 

-               switch( n->value ){
+               switch ( n->value ){

                case TS_CMD_MWW:
                        target_buffer_set_u32( target, target_buf, b );
                        b = 4;
                case TS_CMD_MWW:
                        target_buffer_set_u32( target, target_buf, b );
                        b = 4;


@@ -3827,9 +3829,9 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        b = 1;
                        break;
                }
                        b = 1;
                        break;
                }

-               for( x = 0 ; x < c ; x++ ){
+               for ( x = 0 ; x < c ; x++ ){

                        e = target_write_memory( target, a, b, 1, target_buf );
                        e = target_write_memory( target, a, b, 1, target_buf );

-                       if( e != ERROR_OK ){
+                       if ( e != ERROR_OK ){

                                Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
                                return JIM_ERR;
                        }
                                Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
                                return JIM_ERR;
                        }


@@ -3847,24 +3849,24 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                 * argv[1] = address
                 * argv[2] = optional count
                 */
                 * argv[1] = address
                 * argv[2] = optional count
                 */

-               if( (goi.argc == 2) || (goi.argc == 3) ){
+               if ( (goi.argc == 2) || (goi.argc == 3) ){

                        Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR [COUNT]", n->name );
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Wide( &goi, &a );
                        Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR [COUNT]", n->name );
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Wide( &goi, &a );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        return JIM_ERR;
                }
                        return JIM_ERR;
                }

-               if( goi.argc ){
+               if ( goi.argc ){

                        e = Jim_GetOpt_Wide( &goi, &c );
                        e = Jim_GetOpt_Wide( &goi, &c );

-                       if( e != JIM_OK ){
+                       if ( e != JIM_OK ){

                                return JIM_ERR;
                        }
                } else {
                        c = 1;
                }
                b = 1; /* shut up gcc */
                                return JIM_ERR;
                        }
                } else {
                        c = 1;
                }
                b = 1; /* shut up gcc */

-               switch( n->value ){
+               switch ( n->value ){

                case TS_CMD_MDW:
                        b =  4;
                        break;
                case TS_CMD_MDW:
                        b =  4;
                        break;


@@ -3879,51 +3881,51 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                /* convert to "bytes" */
                c = c * b;
                /* count is now in 'BYTES' */
                /* convert to "bytes" */
                c = c * b;
                /* count is now in 'BYTES' */

-               while( c > 0 ){
+               while ( c > 0 ){

                        y = c;
                        y = c;

-                       if( y > 16 ){
+                       if ( y > 16 ){

                                y = 16;
                        }
                        e = target_read_memory( target, a, b, y / b, target_buf );
                                y = 16;
                        }
                        e = target_read_memory( target, a, b, y / b, target_buf );

-                       if( e != ERROR_OK ){
+                       if ( e != ERROR_OK ){

                                Jim_SetResult_sprintf( interp, "error reading target @ 0x%08lx", (int)(a) );
                                return JIM_ERR;
                        }
 
                        Jim_fprintf( interp, interp->cookie_stdout, "0x%08x ", (int)(a) );
                                Jim_SetResult_sprintf( interp, "error reading target @ 0x%08lx", (int)(a) );
                                return JIM_ERR;
                        }
 
                        Jim_fprintf( interp, interp->cookie_stdout, "0x%08x ", (int)(a) );

-                       switch( b ){
+                       switch ( b ){

                        case 4:
                        case 4:

-                               for( x = 0 ; (x < 16) && (x < y) ; x += 4 ){
+                               for ( x = 0 ; (x < 16) && (x < y) ; x += 4 ){

                                        z = target_buffer_get_u32( target, &(target_buf[ x * 4 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%08x ", (int)(z) );
                                }
                                        z = target_buffer_get_u32( target, &(target_buf[ x * 4 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%08x ", (int)(z) );
                                }

-                               for( ; (x < 16) ; x += 4 ){
+                               for ( ; (x < 16) ; x += 4 ){

                                        Jim_fprintf( interp, interp->cookie_stdout, "         " );
                                }
                                break;
                        case 2:
                                        Jim_fprintf( interp, interp->cookie_stdout, "         " );
                                }
                                break;
                        case 2:

-                               for( x = 0 ; (x < 16) && (x < y) ; x += 2 ){
+                               for ( x = 0 ; (x < 16) && (x < y) ; x += 2 ){

                                        z = target_buffer_get_u16( target, &(target_buf[ x * 2 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%04x ", (int)(z) );
                                }
                                        z = target_buffer_get_u16( target, &(target_buf[ x * 2 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%04x ", (int)(z) );
                                }

-                               for( ; (x < 16) ; x += 2 ){
+                               for ( ; (x < 16) ; x += 2 ){

                                        Jim_fprintf( interp, interp->cookie_stdout, "     " );
                                }
                                break;
                        case 1:
                        default:
                                        Jim_fprintf( interp, interp->cookie_stdout, "     " );
                                }
                                break;
                        case 1:
                        default:

-                               for( x = 0 ; (x < 16) && (x < y) ; x += 1 ){
+                               for ( x = 0 ; (x < 16) && (x < y) ; x += 1 ){

                                        z = target_buffer_get_u8( target, &(target_buf[ x * 4 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%02x ", (int)(z) );
                                }
                                        z = target_buffer_get_u8( target, &(target_buf[ x * 4 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%02x ", (int)(z) );
                                }

-                               for( ; (x < 16) ; x += 1 ){
+                               for ( ; (x < 16) ; x += 1 ){

                                        Jim_fprintf( interp, interp->cookie_stdout, "   " );
                                }
                                break;
                        }
                        /* ascii-ify the bytes */
                                        Jim_fprintf( interp, interp->cookie_stdout, "   " );
                                }
                                break;
                        }
                        /* ascii-ify the bytes */

-                       for( x = 0 ; x < y ; x++ ){
-                               if( (target_buf[x] >= 0x20) &&
+                       for ( x = 0 ; x < y ; x++ ){
+                               if ( (target_buf[x] >= 0x20) &&

                                        (target_buf[x] <= 0x7e) ){
                                        /* good */
                                } else {
                                        (target_buf[x] <= 0x7e) ){
                                        /* good */
                                } else {


@@ -3932,7 +3934,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                                }
                        }
                        /* space pad  */
                                }
                        }
                        /* space pad  */

-                       while( x < 16 ){
+                       while ( x < 16 ){

                                target_buf[x] = ' ';
                                x++;
                        }
                                target_buf[x] = ' ';
                                x++;
                        }


@@ -3952,31 +3954,31 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                return target_array2mem( goi.interp, target, goi.argc, goi.argv );
                break;
        case TS_CMD_EXAMINE:
                return target_array2mem( goi.interp, target, goi.argc, goi.argv );
                break;
        case TS_CMD_EXAMINE:

-               if( goi.argc ){
+               if ( goi.argc ){

                        Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]");
                        return JIM_ERR;
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;
                e = target->type->examine( target );
                        Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]");
                        return JIM_ERR;
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;
                e = target->type->examine( target );

-               if( e != ERROR_OK ){
+               if ( e != ERROR_OK ){

                        Jim_SetResult_sprintf( interp, "examine-fails: %d", e );
                        return JIM_ERR;
                }
                return JIM_OK;
        case TS_CMD_POLL:
                        Jim_SetResult_sprintf( interp, "examine-fails: %d", e );
                        return JIM_ERR;
                }
                return JIM_OK;
        case TS_CMD_POLL:

-               if( goi.argc ){
+               if ( goi.argc ){

                        Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]");
                        return JIM_ERR;
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;
                        Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]");
                        return JIM_ERR;
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;

-               if( !(target_was_examined(target)) ){
+               if ( !(target_was_examined(target)) ){

                        e = ERROR_TARGET_NOT_EXAMINED;
                } else {
                        e = target->type->poll( target );
                }
                        e = ERROR_TARGET_NOT_EXAMINED;
                } else {
                        e = target->type->poll( target );
                }

-               if( e != ERROR_OK ){
+               if ( e != ERROR_OK ){

                        Jim_SetResult_sprintf( interp, "poll-fails: %d", e );
                        return JIM_ERR;
                } else {
                        Jim_SetResult_sprintf( interp, "poll-fails: %d", e );
                        return JIM_ERR;
                } else {


@@ -3984,18 +3986,18 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                }
                break;
        case TS_CMD_RESET:
                }
                break;
        case TS_CMD_RESET:

-               if( goi.argc != 2 ){
-                       Jim_WrongNumArgs( interp, 2, argv, "t|f|assert|deassert BOOL");
+               if ( goi.argc != 2 ){
+                       Jim_WrongNumArgs( interp, 2, argv, "t | f|assert | deassert BOOL");

                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp( &goi, nvp_assert, &n );
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp( &goi, nvp_assert, &n );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        Jim_GetOpt_NvpUnknown( &goi, nvp_assert, 1 );
                        return e;
                }
                /* the halt or not param */
                e = Jim_GetOpt_Wide( &goi, &a);
                        Jim_GetOpt_NvpUnknown( &goi, nvp_assert, 1 );
                        return e;
                }
                /* the halt or not param */
                e = Jim_GetOpt_Wide( &goi, &a);

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        return e;
                }
                if (!target->tap->enabled)
                        return e;
                }
                if (!target->tap->enabled)


@@ -4006,14 +4008,14 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                target_free_all_working_areas_restore(target, 0);
 
                /* do the assert */
                target_free_all_working_areas_restore(target, 0);
 
                /* do the assert */

-               if( n->value == NVP_ASSERT ){
+               if ( n->value == NVP_ASSERT ){

                        target->type->assert_reset( target );
                } else {
                        target->type->deassert_reset( target );
                }
                return JIM_OK;
        case TS_CMD_HALT:
                        target->type->assert_reset( target );
                } else {
                        target->type->deassert_reset( target );
                }
                return JIM_OK;
        case TS_CMD_HALT:

-               if( goi.argc ){
+               if ( goi.argc ){

                        Jim_WrongNumArgs( goi.interp, 0, argv, "halt [no parameters]");
                        return JIM_ERR;
                }
                        Jim_WrongNumArgs( goi.interp, 0, argv, "halt [no parameters]");
                        return JIM_ERR;
                }


@@ -4023,23 +4025,23 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                return JIM_OK;
        case TS_CMD_WAITSTATE:
                /* params:  <name>  statename timeoutmsecs */
                return JIM_OK;
        case TS_CMD_WAITSTATE:
                /* params:  <name>  statename timeoutmsecs */

-               if( goi.argc != 2 ){
+               if ( goi.argc != 2 ){

                        Jim_SetResult_sprintf( goi.interp, "%s STATENAME TIMEOUTMSECS", n->name );
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp( &goi, nvp_target_state, &n );
                        Jim_SetResult_sprintf( goi.interp, "%s STATENAME TIMEOUTMSECS", n->name );
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp( &goi, nvp_target_state, &n );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        Jim_GetOpt_NvpUnknown( &goi, nvp_target_state,1 );
                        return e;
                }
                e = Jim_GetOpt_Wide( &goi, &a );
                        Jim_GetOpt_NvpUnknown( &goi, nvp_target_state,1 );
                        return e;
                }
                e = Jim_GetOpt_Wide( &goi, &a );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        return e;
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;
                e = target_wait_state( target, n->value, a );
                        return e;
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;
                e = target_wait_state( target, n->value, a );

-               if( e != ERROR_OK ){
+               if ( e != ERROR_OK ){

                        Jim_SetResult_sprintf( goi.interp,
                                                                   "target: %s wait %s fails (%d) %s",
                                                                   target->cmd_name,
                        Jim_SetResult_sprintf( goi.interp,
                                                                   "target: %s wait %s fails (%d) %s",
                                                                   target->cmd_name,


@@ -4061,7 +4063,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                                                   target->cmd_name );
                        command_print( cmd_ctx, "%-25s | Body", "Event");
                        command_print( cmd_ctx, "------------------------- | ----------------------------------------");
                                                   target->cmd_name );
                        command_print( cmd_ctx, "%-25s | Body", "Event");
                        command_print( cmd_ctx, "------------------------- | ----------------------------------------");

-                       while( teap ){
+                       while ( teap ){

                                command_print( cmd_ctx,
                                                           "%-25s | %s",
                                                           Jim_Nvp_value2name_simple( nvp_target_event, teap->event )->name,
                                command_print( cmd_ctx,
                                                           "%-25s | %s",
                                                           Jim_Nvp_value2name_simple( nvp_target_event, teap->event )->name,


@@ -4072,7 +4074,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        return JIM_OK;
                }
        case TS_CMD_CURSTATE:
                        return JIM_OK;
                }
        case TS_CMD_CURSTATE:

-               if( goi.argc != 0 ){
+               if ( goi.argc != 0 ){

                        Jim_WrongNumArgs( goi.interp, 0, argv, "[no parameters]");
                        return JIM_ERR;
                }
                        Jim_WrongNumArgs( goi.interp, 0, argv, "[no parameters]");
                        return JIM_ERR;
                }


@@ -4080,12 +4082,12 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                                                         Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
                return JIM_OK;
        case TS_CMD_INVOKE_EVENT:
                                                         Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
                return JIM_OK;
        case TS_CMD_INVOKE_EVENT:

-               if( goi.argc != 1 ){
+               if ( goi.argc != 1 ){

                        Jim_SetResult_sprintf( goi.interp, "%s ?EVENTNAME?",n->name);
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp( &goi, nvp_target_event, &n );
                        Jim_SetResult_sprintf( goi.interp, "%s ?EVENTNAME?",n->name);
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp( &goi, nvp_target_event, &n );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        Jim_GetOpt_NvpUnknown( &goi, nvp_target_event, 1 );
                        return e;
                }
                        Jim_GetOpt_NvpUnknown( &goi, nvp_target_event, 1 );
                        return e;
                }


@@ -4111,7 +4113,7 @@ static int target_create( Jim_GetOptInfo *goi )
        struct command_context_s *cmd_ctx;
 
        cmd_ctx = Jim_GetAssocData(goi->interp, "context");
        struct command_context_s *cmd_ctx;
 
        cmd_ctx = Jim_GetAssocData(goi->interp, "context");

-       if( goi->argc < 3 ){
+       if ( goi->argc < 3 ){

                Jim_WrongNumArgs( goi->interp, 1, goi->argv, "?name? ?type? ..options...");
                return JIM_ERR;
        }
                Jim_WrongNumArgs( goi->interp, 1, goi->argv, "?name? ?type? ..options...");
                return JIM_ERR;
        }


@@ -4120,7 +4122,7 @@ static int target_create( Jim_GetOptInfo *goi )
        Jim_GetOpt_Obj( goi, &new_cmd );
        /* does this command exist? */
        cmd = Jim_GetCommand( goi->interp, new_cmd, JIM_ERRMSG );
        Jim_GetOpt_Obj( goi, &new_cmd );
        /* does this command exist? */
        cmd = Jim_GetCommand( goi->interp, new_cmd, JIM_ERRMSG );

-       if( cmd ){
+       if ( cmd ){

                cp = Jim_GetString( new_cmd, NULL );
                Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
                return JIM_ERR;
                cp = Jim_GetString( new_cmd, NULL );
                Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
                return JIM_ERR;


@@ -4130,16 +4132,16 @@ static int target_create( Jim_GetOptInfo *goi )
        e = Jim_GetOpt_String( goi, &cp2, NULL );
        cp = cp2;
        /* now does target type exist */
        e = Jim_GetOpt_String( goi, &cp2, NULL );
        cp = cp2;
        /* now does target type exist */

-       for( x = 0 ; target_types[x] ; x++ ){
-               if( 0 == strcmp( cp, target_types[x]->name ) ){
+       for ( x = 0 ; target_types[x] ; x++ ){
+               if ( 0 == strcmp( cp, target_types[x]->name ) ){

                        /* found */
                        break;
                }
        }
                        /* found */
                        break;
                }
        }

-       if( target_types[x] == NULL ){
+       if ( target_types[x] == NULL ){

                Jim_SetResult_sprintf( goi->interp, "Unknown target type %s, try one of ", cp );
                Jim_SetResult_sprintf( goi->interp, "Unknown target type %s, try one of ", cp );

-               for( x = 0 ; target_types[x] ; x++ ){
-                       if( target_types[x+1] ){
+               for ( x = 0 ; target_types[x] ; x++ ){
+                       if ( target_types[x + 1] ){

                                Jim_AppendStrings( goi->interp,
                                                                   Jim_GetResult(goi->interp),
                                                                   target_types[x]->name,
                                Jim_AppendStrings( goi->interp,
                                                                   Jim_GetResult(goi->interp),
                                                                   target_types[x]->name,


@@ -4204,16 +4206,16 @@ static int target_create( Jim_GetOptInfo *goi )
        if (target->tap == NULL)
        {
                Jim_SetResultString( interp, "-chain-position required when creating target", -1);
        if (target->tap == NULL)
        {
                Jim_SetResultString( interp, "-chain-position required when creating target", -1);

-               e=JIM_ERR;
+               e = JIM_ERR;

        }
 
        }
 

-       if( e != JIM_OK ){
+       if ( e != JIM_OK ){

                free( target->type );
                free( target );
                return e;
        }
 
                free( target->type );
                free( target );
                return e;
        }
 

-       if( target->endianness == TARGET_ENDIAN_UNKNOWN ){
+       if ( target->endianness == TARGET_ENDIAN_UNKNOWN ){

                /* default endian to little if not specified */
                target->endianness = TARGET_LITTLE_ENDIAN;
        }
                /* default endian to little if not specified */
                target->endianness = TARGET_LITTLE_ENDIAN;
        }


@@ -4223,10 +4225,10 @@ static int target_create( Jim_GetOptInfo *goi )
                target->variant = strdup("");
 
        /* create the target specific commands */
                target->variant = strdup("");
 
        /* create the target specific commands */

-       if( target->type->register_commands ){
+       if ( target->type->register_commands ){

                (*(target->type->register_commands))( cmd_ctx );
        }
                (*(target->type->register_commands))( cmd_ctx );
        }

-       if( target->type->target_create ){
+       if ( target->type->target_create ){

                (*(target->type->target_create))( target, goi->interp );
        }
 
                (*(target->type->target_create))( target, goi->interp );
        }
 


@@ -4234,7 +4236,7 @@ static int target_create( Jim_GetOptInfo *goi )
        {
                target_t **tpp;
                tpp = &(all_targets);
        {
                target_t **tpp;
                tpp = &(all_targets);

-               while( *tpp ){
+               while ( *tpp ){

                        tpp = &( (*tpp)->next );
                }
                *tpp = target;
                        tpp = &( (*tpp)->next );
                }
                *tpp = target;


@@ -4281,50 +4283,50 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 
        cmd_ctx = Jim_GetAssocData( interp, "context" );
 
 
        cmd_ctx = Jim_GetAssocData( interp, "context" );
 

-       Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 );
+       Jim_GetOpt_Setup( &goi, interp, argc-1, argv + 1 );

 
 

-       if( goi.argc == 0 ){
+       if ( goi.argc == 0 ){

                Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
                return JIM_ERR;
        }
 
        /* Jim_GetOpt_Debug( &goi ); */
        r = Jim_GetOpt_Enum( &goi, target_cmds, &x   );
                Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
                return JIM_ERR;
        }
 
        /* Jim_GetOpt_Debug( &goi ); */
        r = Jim_GetOpt_Enum( &goi, target_cmds, &x   );

-       if( r != JIM_OK ){
+       if ( r != JIM_OK ){

                return r;
        }
 
                return r;
        }
 

-       switch(x){
+       switch (x){

        default:
                Jim_Panic(goi.interp,"Why am I here?");
                return JIM_ERR;
        case TG_CMD_CURRENT:
        default:
                Jim_Panic(goi.interp,"Why am I here?");
                return JIM_ERR;
        case TG_CMD_CURRENT:

-               if( goi.argc != 0 ){
+               if ( goi.argc != 0 ){

                        Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters");
                        return JIM_ERR;
                }
                Jim_SetResultString( goi.interp, get_current_target( cmd_ctx )->cmd_name, -1 );
                return JIM_OK;
        case TG_CMD_TYPES:
                        Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters");
                        return JIM_ERR;
                }
                Jim_SetResultString( goi.interp, get_current_target( cmd_ctx )->cmd_name, -1 );
                return JIM_OK;
        case TG_CMD_TYPES:

-               if( goi.argc != 0 ){
+               if ( goi.argc != 0 ){

                        Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
                        return JIM_ERR;
                }
                Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );
                        Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
                        return JIM_ERR;
                }
                Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );

-               for( x = 0 ; target_types[x] ; x++ ){
+               for ( x = 0 ; target_types[x] ; x++ ){

                        Jim_ListAppendElement( goi.interp,
                                                                   Jim_GetResult(goi.interp),
                                                                   Jim_NewStringObj( goi.interp, target_types[x]->name, -1 ) );
                }
                return JIM_OK;
        case TG_CMD_NAMES:
                        Jim_ListAppendElement( goi.interp,
                                                                   Jim_GetResult(goi.interp),
                                                                   Jim_NewStringObj( goi.interp, target_types[x]->name, -1 ) );
                }
                return JIM_OK;
        case TG_CMD_NAMES:

-               if( goi.argc != 0 ){
+               if ( goi.argc != 0 ){

                        Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
                        return JIM_ERR;
                }
                Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );
                target = all_targets;
                        Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" );
                        return JIM_ERR;
                }
                Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );
                target = all_targets;

-               while( target ){
+               while ( target ){

                        Jim_ListAppendElement( goi.interp,
                                                                   Jim_GetResult(goi.interp),
                                                                   Jim_NewStringObj( goi.interp, target->cmd_name, -1 ) );
                        Jim_ListAppendElement( goi.interp,
                                                                   Jim_GetResult(goi.interp),
                                                                   Jim_NewStringObj( goi.interp, target->cmd_name, -1 ) );


@@ -4332,25 +4334,25 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                }
                return JIM_OK;
        case TG_CMD_CREATE:
                }
                return JIM_OK;
        case TG_CMD_CREATE:

-               if( goi.argc < 3 ){
+               if ( goi.argc < 3 ){

                        Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "?name  ... config options ...");
                        return JIM_ERR;
                }
                return target_create( &goi );
                break;
        case TG_CMD_NUMBER:
                        Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "?name  ... config options ...");
                        return JIM_ERR;
                }
                return target_create( &goi );
                break;
        case TG_CMD_NUMBER:

-               if( goi.argc != 1 ){
+               if ( goi.argc != 1 ){

                        Jim_SetResult_sprintf( goi.interp, "expected: target number ?NUMBER?");
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Wide( &goi, &w );
                        Jim_SetResult_sprintf( goi.interp, "expected: target number ?NUMBER?");
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Wide( &goi, &w );

-               if( e != JIM_OK ){
+               if ( e != JIM_OK ){

                        return JIM_ERR;
                }
                {
                        target_t *t;
                        t = get_target_by_num(w);
                        return JIM_ERR;
                }
                {
                        target_t *t;
                        t = get_target_by_num(w);

-                       if( t == NULL ){
+                       if ( t == NULL ){

                                Jim_SetResult_sprintf( goi.interp,"Target: number %d does not exist", (int)(w));
                                return JIM_ERR;
                        }
                                Jim_SetResult_sprintf( goi.interp,"Target: number %d does not exist", (int)(w));
                                return JIM_ERR;
                        }


@@ -4358,7 +4360,7 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        return JIM_OK;
                }
        case TG_CMD_COUNT:
                        return JIM_OK;
                }
        case TG_CMD_COUNT:

-               if( goi.argc != 0 ){
+               if ( goi.argc != 0 ){

                        Jim_WrongNumArgs( goi.interp, 0, goi.argv, "<no parameters>");
                        return JIM_ERR;
                }
                        Jim_WrongNumArgs( goi.interp, 0, goi.argv, "<no parameters>");
                        return JIM_ERR;
                }


@@ -4384,16 +4386,16 @@ static struct FastLoad *fastload;
 
 static void free_fastload(void)
 {
 
 static void free_fastload(void)
 {

-       if (fastload!=NULL)
+       if (fastload != NULL)

        {
                int i;
        {
                int i;

-               for (i=0; i<fastload_num; i++)
+               for (i = 0; i<fastload_num; i++)

                {
                        if (fastload[i].data)
                                free(fastload[i].data);
                }
                free(fastload);
                {
                        if (fastload[i].data)
                                free(fastload[i].data);
                }
                free(fastload);

-               fastload=NULL;
+               fastload = NULL;

        }
 }
 
        }
 }
 


@@ -4405,8 +4407,8 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
        uint8_t *buffer;
        uint32_t buf_cnt;
        uint32_t image_size;
        uint8_t *buffer;
        uint32_t buf_cnt;
        uint32_t image_size;

-       uint32_t min_address=0;
-       uint32_t max_address=0xffffffff;
+       uint32_t min_address = 0;
+       uint32_t max_address = 0xffffffff;

        int i;
 
        image_t image;
        int i;
 
        image_t image;


@@ -4428,9 +4430,9 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
 
        image_size = 0x0;
        retval = ERROR_OK;
 
        image_size = 0x0;
        retval = ERROR_OK;

-       fastload_num=image.num_sections;
-       fastload=(struct FastLoad *)malloc(sizeof(struct FastLoad)*image.num_sections);
-       if (fastload==NULL)
+       fastload_num = image.num_sections;
+       fastload = (struct FastLoad *)malloc(sizeof(struct FastLoad)*image.num_sections);
+       if (fastload == NULL)

        {
                image_close(&image);
                return ERROR_FAIL;
        {
                image_close(&image);
                return ERROR_FAIL;


@@ -4452,48 +4454,48 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
                        break;
                }
 
                        break;
                }
 

-               uint32_t offset=0;
-               uint32_t length=buf_cnt;
+               uint32_t offset = 0;
+               uint32_t length = buf_cnt;

 
 
                /* DANGER!!! beware of unsigned comparision here!!! */
 
 
 
                /* DANGER!!! beware of unsigned comparision here!!! */
 

-               if ((image.sections[i].base_address+buf_cnt>=min_address)&&
+               if ((image.sections[i].base_address + buf_cnt >= min_address)&&

                                (image.sections[i].base_address<max_address))
                {
                        if (image.sections[i].base_address<min_address)
                        {
                                /* clip addresses below */
                                (image.sections[i].base_address<max_address))
                {
                        if (image.sections[i].base_address<min_address)
                        {
                                /* clip addresses below */

-                               offset+=min_address-image.sections[i].base_address;
-                               length-=offset;
+                               offset += min_address-image.sections[i].base_address;
+                               length -= offset;

                        }
 
                        }
 

-                       if (image.sections[i].base_address+buf_cnt>max_address)
+                       if (image.sections[i].base_address + buf_cnt>max_address)

                        {
                        {

-                               length-=(image.sections[i].base_address+buf_cnt)-max_address;
+                               length -= (image.sections[i].base_address + buf_cnt)-max_address;

                        }
 
                        }
 

-                       fastload[i].address=image.sections[i].base_address+offset;
-                       fastload[i].data=malloc(length);
-                       if (fastload[i].data==NULL)
+                       fastload[i].address = image.sections[i].base_address + offset;
+                       fastload[i].data = malloc(length);
+                       if (fastload[i].data == NULL)

                        {
                                free(buffer);
                                break;
                        }
                        {
                                free(buffer);
                                break;
                        }

-                       memcpy(fastload[i].data, buffer+offset, length);
-                       fastload[i].length=length;
+                       memcpy(fastload[i].data, buffer + offset, length);
+                       fastload[i].length = length;

 
                        image_size += length;
                        command_print(cmd_ctx, "%u byte written at address 0x%8.8x", 
                                                  (unsigned int)length, 
 
                        image_size += length;
                        command_print(cmd_ctx, "%u byte written at address 0x%8.8x", 
                                                  (unsigned int)length, 

-                                                 ((unsigned int)(image.sections[i].base_address+offset)));
+                                                 ((unsigned int)(image.sections[i].base_address + offset)));

                }
 
                free(buffer);
        }
 
        duration_stop_measure(&duration, &duration_text);
                }
 
                free(buffer);
        }
 
        duration_stop_measure(&duration, &duration_text);

-       if (retval==ERROR_OK)
+       if (retval == ERROR_OK)

        {
                command_print(cmd_ctx, "Loaded %u bytes in %s", (unsigned int)image_size, duration_text);
                command_print(cmd_ctx, "NB!!! image has not been loaded to target, issue a subsequent 'fast_load' to do so.");
        {
                command_print(cmd_ctx, "Loaded %u bytes in %s", (unsigned int)image_size, duration_text);
                command_print(cmd_ctx, "NB!!! image has not been loaded to target, issue a subsequent 'fast_load' to do so.");


@@ -4502,7 +4504,7 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
 
        image_close(&image);
 
 
        image_close(&image);
 

-       if (retval!=ERROR_OK)
+       if (retval != ERROR_OK)

        {
                free_fastload();
        }
        {
                free_fastload();
        }


@@ -4514,28 +4516,28 @@ static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd
 {
        if (argc>0)
                return ERROR_COMMAND_SYNTAX_ERROR;
 {
        if (argc>0)
                return ERROR_COMMAND_SYNTAX_ERROR;

-       if (fastload==NULL)
+       if (fastload == NULL)

        {
                LOG_ERROR("No image in memory");
                return ERROR_FAIL;
        }
        int i;
        {
                LOG_ERROR("No image in memory");
                return ERROR_FAIL;
        }
        int i;

-       int ms=timeval_ms();
-       int size=0;
-       int retval=ERROR_OK;
-       for (i=0; i<fastload_num;i++)
+       int ms = timeval_ms();
+       int size = 0;
+       int retval = ERROR_OK;
+       for (i = 0; i<fastload_num;i++)

        {
                target_t *target = get_current_target(cmd_ctx);
                command_print(cmd_ctx, "Write to 0x%08x, length 0x%08x", 
                                          (unsigned int)(fastload[i].address), 
                                          (unsigned int)(fastload[i].length));
        {
                target_t *target = get_current_target(cmd_ctx);
                command_print(cmd_ctx, "Write to 0x%08x, length 0x%08x", 
                                          (unsigned int)(fastload[i].address), 
                                          (unsigned int)(fastload[i].length));

-               if (retval==ERROR_OK)
+               if (retval == ERROR_OK)

                {
                        retval = target_write_buffer(target, fastload[i].address, fastload[i].length, fastload[i].data);
                }
                {
                        retval = target_write_buffer(target, fastload[i].address, fastload[i].length, fastload[i].data);
                }

-               size+=fastload[i].length;
+               size += fastload[i].length;

        }
        }

-       int after=timeval_ms();
+       int after = timeval_ms();

        command_print(cmd_ctx, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
        return retval;
 }
        command_print(cmd_ctx, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
        return retval;
 }