X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=097d7130c24575e66b67d82f6e9a917f6c6ef61b;hp=3505f9c251d40c396c66c3d3eae971679f8670e8;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=e43979e7020ea9d05a3c0a2af444f292eacb6c53 diff --git a/src/target/target.c b/src/target/target.c index 3505f9c251..097d7130c2 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -70,7 +70,7 @@ static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv); static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv); -static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv); +static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv); static int target_array2mem(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); @@ -139,12 +139,12 @@ const Jim_Nvp nvp_error_target[] = { { .value = -1, .name = NULL } }; -const char *target_strerror_safe( int err ) +const char *target_strerror_safe(int err) { const Jim_Nvp *n; - n = Jim_Nvp_value2name_simple( nvp_error_target, err ); - if ( n->name == NULL ){ + n = Jim_Nvp_value2name_simple(nvp_error_target, err); + if (n->name == NULL){ return "unknown"; } else { return n->name; @@ -244,9 +244,9 @@ static int max_target_number(void) 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; } @@ -262,13 +262,13 @@ static int new_target_number(void) /* 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; } - return x+1; + return x + 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){ - if ( target->target_number == num ){ + if (target->target_number == num){ return target; } target = target->next; @@ -428,8 +428,8 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo char buf[100]; int retval; Jim_Nvp *n; - n = Jim_Nvp_value2name_simple( nvp_reset_modes, reset_mode ); - if ( n->name == NULL ){ + n = Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode); + if (n->name == NULL){ LOG_ERROR("invalid reset mode"); return ERROR_FAIL; } @@ -441,8 +441,8 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo int save_poll = target_continuous_poll; target_continuous_poll = 0; - sprintf( buf, "ocd_process_reset %s", n->name ); - retval = Jim_Eval( interp, buf ); + sprintf(buf, "ocd_process_reset %s", n->name); + retval = Jim_Eval(interp, buf); target_continuous_poll = save_poll; @@ -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 @@ -823,9 +823,9 @@ int target_call_event_callbacks(target_t *target, enum target_event event) LOG_DEBUG("target event %i (%s)", event, - Jim_Nvp_value2name_simple( nvp_target_event, event )->name ); + Jim_Nvp_value2name_simple(nvp_target_event, event)->name); - target_handle_event( target, event ); + target_handle_event(target, event); while (callback) { @@ -1014,7 +1014,7 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar if (area->free) return ERROR_OK; - if (restore&&target->backup_working_area) + if (restore && target->backup_working_area) { int retval; if ((retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK) @@ -1071,7 +1071,7 @@ int target_register_commands(struct command_context_s *cmd_ctx) - register_jim(cmd_ctx, "target", jim_target, "configure target" ); + register_jim(cmd_ctx, "target", jim_target, "configure target"); return ERROR_OK; } @@ -1079,7 +1079,7 @@ int target_register_commands(struct command_context_s *cmd_ctx) 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; @@ -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); - if (target->state!=TARGET_HALTED) + if (target->state != TARGET_HALTED) return ERROR_OK; - retval=target->type->arch_state(target); + retval = target->type->arch_state(target); 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*/ - 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; @@ -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*/ - 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; @@ -1286,7 +1286,7 @@ int target_checksum_memory(struct target_s *target, uint32_t address, uint32_t s target_buffer_set_u32(target, &buffer[i*sizeof(uint32_t)], target_data); } - retval = image_calculate_checksum( buffer, size, &checksum ); + retval = image_calculate_checksum(buffer, size, &checksum); free(buffer); } @@ -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"); - register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing
"); - register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values
"); + register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing
"); + register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values
"); 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, "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 [count]"); @@ -1520,7 +1520,7 @@ static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, { target = get_target(args[0]); if (target == NULL) { - command_print(cmd_ctx,"Target: %s is unknown, try one of:\n", args[0] ); + command_print(cmd_ctx,"Target: %s is unknown, try one of:\n", args[0]); goto DumpTargets; } if (!target->tap->enabled) { @@ -1584,7 +1584,7 @@ static int sense_handler(void) 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; @@ -1603,7 +1603,7 @@ static int sense_handler(void) lastPower = current; } - if ((retval=jtag_srst_asserted(&srstAsserted))!=ERROR_OK) + if ((retval = jtag_srst_asserted(&srstAsserted)) != ERROR_OK) return retval; int srstDeasserted; @@ -1654,22 +1654,22 @@ int handle_target(void *priv) int did_something = 0; if (runSrstAsserted) { - Jim_Eval( interp, "srst_asserted"); + Jim_Eval(interp, "srst_asserted"); did_something = 1; } if (runSrstDeasserted) { - Jim_Eval( interp, "srst_deasserted"); + Jim_Eval(interp, "srst_deasserted"); did_something = 1; } if (runPowerDropout) { - Jim_Eval( interp, "power_dropout"); + Jim_Eval(interp, "power_dropout"); did_something = 1; } if (runPowerRestore) { - Jim_Eval( interp, "power_restore"); + Jim_Eval(interp, "power_restore"); did_something = 1; } @@ -1681,10 +1681,10 @@ int handle_target(void *priv) /* clear action flags */ - runSrstAsserted=0; - runSrstDeasserted=0; - runPowerRestore=0; - runPowerDropout=0; + runSrstAsserted = 0; + runSrstDeasserted = 0; + runPowerRestore = 0; + runPowerDropout = 0; recursive = 0; } @@ -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; - while(cache) + while (cache) { 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; - while(cache) + while (cache) { 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; } - else if (argc==1) + else if (argc == 1) { 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; - long long then=0, cur; - int once=1; + long long then = 0, cur; + int once = 1; for (;;) { - if ((retval=target_poll(target))!=ERROR_OK) + if ((retval = target_poll(target)) != ERROR_OK) return retval; if (target->state == state) { @@ -1918,18 +1918,18 @@ int target_wait_state(target_t *target, enum target_state state, int ms) 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); } - if (cur-then>500) + if (cur-then > 500) { keep_alive(); } - if ((cur-then)>ms) + if ((cur-then) > ms) { LOG_ERROR("timed out while waiting for target %s", Jim_Nvp_value2name_simple(nvp_target_state,state)->name); @@ -1982,8 +1982,8 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch if (argc == 1) { const Jim_Nvp *n; - n = Jim_Nvp_name2value_simple( nvp_reset_modes, args[0] ); - if ( (n->name == NULL) || (n->value == RESET_UNKNOWN) ){ + n = Jim_Nvp_name2value_simple(nvp_reset_modes, args[0]); + if ((n->name == NULL) || (n->value == RESET_UNKNOWN)){ return ERROR_COMMAND_SYNTAX_ERROR; } reset_mode = n->value; @@ -2070,7 +2070,7 @@ static void handle_md_output(struct command_context_s *cmd_ctx, (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; @@ -2274,27 +2274,27 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm 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!!! */ - if ((image.sections[i].base_address+buf_cnt>=min_address)&& - (image.sections[i].base_address= min_address)&& + (image.sections[i].base_address < max_address)) { - if (image.sections[i].base_addressmax_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; @@ -2302,7 +2302,7 @@ 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.sections[i].base_address+offset); + image.sections[i].base_address + offset); } free(buffer); @@ -2314,7 +2314,7 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm return retvaltemp; } - if (retval==ERROR_OK) + if (retval == ERROR_OK) { command_print(cmd_ctx, "downloaded %u byte in %s", (unsigned int)image_size, @@ -2390,7 +2390,7 @@ static int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cm if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) return retvaltemp; - if (retval==ERROR_OK) + if (retval == ERROR_OK) { command_print(cmd_ctx, "dumped %lld byte in %s", fileio.size, duration_text); @@ -2447,13 +2447,13 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct 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; - retval=ERROR_OK; + retval = ERROR_OK; for (i = 0; i < image.num_sections; i++) { buffer = malloc(image.sections[i].size); @@ -2473,16 +2473,16 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct if (verify) { /* calculate checksum of image */ - image_calculate_checksum( buffer, buf_cnt, &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; } - if ( checksum != mem_checksum ) + if (checksum != mem_checksum) { /* failed crc checksum, fall back to a binary compare */ uint8_t *data; @@ -2514,10 +2514,10 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct buffer[t]); free(data); free(buffer); - retval=ERROR_FAIL; + retval = ERROR_FAIL; goto done; } - if ((t%16384)==0) + if ((t%16384) == 0) { keep_alive(); } @@ -2544,7 +2544,7 @@ done: return retvaltemp; } - if (retval==ERROR_OK) + if (retval == ERROR_OK) { command_print(cmd_ctx, "verified %u bytes in %s", (unsigned int)image_size, @@ -2699,7 +2699,7 @@ static int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char return retval; // fall through case 3: - switch(args[2][0]) + switch (args[2][0]) { case 'r': type = WPT_READ; @@ -2790,9 +2790,9 @@ static void writeData(FILE *f, const void *data, size_t len) 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); } @@ -2807,8 +2807,8 @@ static void writeString(FILE *f, char *s) 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 */ @@ -2820,42 +2820,42 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename) writeData(f, &zero, 1); /* figure out bucket size */ - uint32_t min=samples[0]; - uint32_t max=samples[0]; - for (i=0; isamples[i]) + if (min > samples[i]) { - min=samples[i]; + min = samples[i]; } - if (max 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); - for (i=0; i65535) + val = buckets[i]; + if (val > 65535) { - val=65535; + val = 65535; } 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); @@ -2903,7 +2903,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, struct timeval timeout, now; gettimeofday(&timeout, NULL); - if (argc!=2) + if (argc != 2) { return ERROR_COMMAND_SYNTAX_ERROR; } @@ -2916,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..."); - 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; - 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); @@ -2946,16 +2946,16 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, } else { command_print(cmd_ctx, "Target not halted or running"); - retval=ERROR_OK; + retval = ERROR_OK; break; } - if (retval!=ERROR_OK) + if (retval != ERROR_OK) { 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); if ((retval = target_poll(target)) != ERROR_OK) @@ -3028,7 +3028,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) 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) @@ -3084,7 +3084,7 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_ break; default: Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - Jim_AppendStrings( interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL ); + Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL); return JIM_ERR; } if (len == 0) { @@ -3132,7 +3132,7 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_ count = (sizeof(buffer)/width); } - retval = target_read_memory( target, addr, width, count, buffer ); + retval = target_read_memory(target, addr, width, count, buffer); if (retval != ERROR_OK) { /* BOO !*/ LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed", @@ -3215,7 +3215,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) 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) @@ -3271,7 +3271,7 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_ break; default: Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - Jim_AppendStrings( interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL ); + Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL); return JIM_ERR; } if (len == 0) { @@ -3355,22 +3355,22 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_ return JIM_OK; } -void target_all_handle_event( enum target_event e ) +void target_all_handle_event(enum target_event e) { target_t *target; - LOG_DEBUG( "**all*targets: event: %d, %s", + LOG_DEBUG("**all*targets: event: %d, %s", (int)e, - Jim_Nvp_value2name_simple( nvp_target_event, e )->name ); + Jim_Nvp_value2name_simple(nvp_target_event, e)->name); target = all_targets; while (target){ - target_handle_event( target, e ); + target_handle_event(target, e); target = target->next; } } -void target_handle_event( target_t *target, enum target_event e ) +void target_handle_event(target_t *target, enum target_event e) { target_event_action_t *teap; int done; @@ -3378,27 +3378,27 @@ void target_handle_event( target_t *target, enum target_event e ) 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", + LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s\n", target->target_number, target->cmd_name, target_get_name(target), e, - Jim_Nvp_value2name_simple( nvp_target_event, e )->name, - Jim_GetString( teap->body, NULL ) ); - if (Jim_EvalObj( interp, teap->body )!=JIM_OK) + Jim_Nvp_value2name_simple(nvp_target_event, e)->name, + Jim_GetString(teap->body, NULL)); + if (Jim_EvalObj(interp, teap->body) != JIM_OK) { Jim_PrintErrorMessage(interp); } } teap = teap->next; } - if ( !done ){ - LOG_DEBUG( "event: %d %s - no action", + if (!done){ + LOG_DEBUG("event: %d %s - no action", e, - Jim_Nvp_value2name_simple( nvp_target_event, e )->name ); + Jim_Nvp_value2name_simple(nvp_target_event, e)->name); } } @@ -3428,7 +3428,7 @@ static Jim_Nvp nvp_config_opts[] = { { .name = NULL, .value = -1 } }; -static int target_configure( Jim_GetOptInfo *goi, target_t *target ) +static int target_configure(Jim_GetOptInfo *goi, target_t *target) { Jim_Nvp *n; Jim_Obj *o; @@ -3437,64 +3437,64 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) int e; /* parse config or cget options ... */ - while( goi->argc > 0 ){ - Jim_SetEmptyResult( goi->interp ); - /* Jim_GetOpt_Debug( goi ); */ + while (goi->argc > 0){ + 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 ); - if ( e == JIM_OK ){ + e = (*(target->type->target_jim_configure))(target, goi); + if (e == JIM_OK){ /* 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 ); - if ( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( goi, nvp_config_opts, 0 ); + e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(goi, nvp_config_opts, 0); return e; } - switch( n->value ){ + switch (n->value){ case TCFG_TYPE: /* not setable */ - if ( goi->isconfigure ){ - Jim_SetResult_sprintf( goi->interp, "not setable: %s", n->name ); + if (goi->isconfigure){ + Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name); return JIM_ERR; } else { no_params: - if ( goi->argc != 0 ){ - Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "NO PARAMS"); + if (goi->argc != 0){ + Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "NO PARAMS"); return JIM_ERR; } } - Jim_SetResultString( goi->interp, target_get_name(target), -1 ); + Jim_SetResultString(goi->interp, target_get_name(target), -1); /* loop for more */ break; case TCFG_EVENT: - if ( goi->argc == 0 ){ - Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ..."); + 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 ); - if ( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( goi, nvp_target_event, 1 ); + e = Jim_GetOpt_Nvp(goi, nvp_target_event, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(goi, nvp_target_event, 1); return e; } - if ( goi->isconfigure ){ - if ( goi->argc != 1 ){ - Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?"); + if (goi->isconfigure){ + if (goi->argc != 1){ + 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; } @@ -3505,24 +3505,24 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) 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; } - if ( goi->isconfigure ){ - if ( teap == NULL ){ + if (goi->isconfigure){ + if (teap == NULL){ /* create new */ - teap = calloc( 1, sizeof(*teap) ); + teap = calloc(1, sizeof(*teap)); } teap->event = n->value; - Jim_GetOpt_Obj( goi, &o ); - if ( teap->body ){ - Jim_DecrRefCount( interp, teap->body ); + Jim_GetOpt_Obj(goi, &o); + if (teap->body){ + Jim_DecrRefCount(interp, teap->body); } - teap->body = Jim_DuplicateObj( goi->interp, o ); + teap->body = Jim_DuplicateObj(goi->interp, o); /* * FIXME: * Tcl/TK - "tk events" have a nice feature. @@ -3533,7 +3533,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) * The idea is: %N - target number * The idea is: %E - event name. */ - Jim_IncrRefCount( teap->body ); + Jim_IncrRefCount(teap->body); /* add to head of event list */ teap->next = target->event_action; @@ -3541,10 +3541,10 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) Jim_SetEmptyResult(goi->interp); } else { /* get */ - if ( teap == NULL ){ - Jim_SetEmptyResult( goi->interp ); + if (teap == NULL){ + Jim_SetEmptyResult(goi->interp); } else { - Jim_SetResult( goi->interp, Jim_DuplicateObj( goi->interp, teap->body ) ); + Jim_SetResult(goi->interp, Jim_DuplicateObj(goi->interp, teap->body)); } } } @@ -3552,67 +3552,67 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) break; case TCFG_WORK_AREA_VIRT: - if ( goi->isconfigure ){ + if (goi->isconfigure){ target_free_all_working_areas(target); - e = Jim_GetOpt_Wide( goi, &w ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(goi, &w); + if (e != JIM_OK){ return e; } target->working_area_virt = w; } else { - if ( goi->argc != 0 ){ + if (goi->argc != 0){ goto no_params; } } - Jim_SetResult( interp, Jim_NewIntObj( goi->interp, target->working_area_virt ) ); + Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_virt)); /* loop for more */ break; case TCFG_WORK_AREA_PHYS: - if ( goi->isconfigure ){ + if (goi->isconfigure){ target_free_all_working_areas(target); - e = Jim_GetOpt_Wide( goi, &w ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(goi, &w); + if (e != JIM_OK){ return e; } target->working_area_phys = w; } else { - if ( goi->argc != 0 ){ + if (goi->argc != 0){ goto no_params; } } - Jim_SetResult( interp, Jim_NewIntObj( goi->interp, target->working_area_phys ) ); + Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_phys)); /* loop for more */ break; case TCFG_WORK_AREA_SIZE: - if ( goi->isconfigure ){ + if (goi->isconfigure){ target_free_all_working_areas(target); - e = Jim_GetOpt_Wide( goi, &w ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(goi, &w); + if (e != JIM_OK){ return e; } target->working_area_size = w; } else { - if ( goi->argc != 0 ){ + if (goi->argc != 0){ goto no_params; } } - Jim_SetResult( interp, Jim_NewIntObj( goi->interp, target->working_area_size ) ); + Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_size)); /* loop for more */ break; case TCFG_WORK_AREA_BACKUP: - if ( goi->isconfigure ){ + if (goi->isconfigure){ target_free_all_working_areas(target); - e = Jim_GetOpt_Wide( goi, &w ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(goi, &w); + if (e != JIM_OK){ 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; } } @@ -3621,73 +3621,73 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) break; case TCFG_ENDIAN: - if ( goi->isconfigure ){ - e = Jim_GetOpt_Nvp( goi, nvp_target_endian, &n ); - if ( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( goi, nvp_target_endian, 1 ); + if (goi->isconfigure){ + e = Jim_GetOpt_Nvp(goi, nvp_target_endian, &n); + if (e != JIM_OK){ + 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 ); - if ( n->name == NULL ){ + n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness); + if (n->name == NULL){ target->endianness = TARGET_LITTLE_ENDIAN; - n = Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness ); + n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness); } - Jim_SetResultString( goi->interp, n->name, -1 ); + Jim_SetResultString(goi->interp, n->name, -1); /* loop for more */ break; case TCFG_VARIANT: - if ( goi->isconfigure ){ - if ( goi->argc < 1 ){ - Jim_SetResult_sprintf( goi->interp, + if (goi->isconfigure){ + if (goi->argc < 1){ + Jim_SetResult_sprintf(goi->interp, "%s ?STRING?", - n->name ); + n->name); return JIM_ERR; } - if ( target->variant ){ + if (target->variant){ free((void *)(target->variant)); } - e = Jim_GetOpt_String( goi, &cp, NULL ); + e = Jim_GetOpt_String(goi, &cp, NULL); target->variant = strdup(cp); } else { - if ( goi->argc != 0 ){ + if (goi->argc != 0){ goto no_params; } } - Jim_SetResultString( goi->interp, target->variant,-1 ); + Jim_SetResultString(goi->interp, target->variant,-1); /* 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 ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Obj(goi, &o); + if (e != JIM_OK){ return e; } - tap = jtag_tap_by_jim_obj( goi->interp, o ); - if ( tap == NULL ){ + tap = jtag_tap_by_jim_obj(goi->interp, o); + if (tap == NULL){ return JIM_ERR; } /* make this exactly 1 or 0 */ target->tap = tap; } else { - if ( goi->argc != 0 ){ + if (goi->argc != 0){ goto no_params; } } - Jim_SetResultString( interp, target->tap->dotted_name, -1 ); + Jim_SetResultString(interp, target->tap->dotted_name, -1); /* loop for more e*/ break; } - } /* while( goi->argc ) */ + } /* while (goi->argc) */ /* done - we return */ @@ -3695,7 +3695,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) } /** this is the 'tcl' handler for the target specific command */ -static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) +static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { Jim_GetOptInfo goi; jim_wide a,b,c; @@ -3749,36 +3749,36 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) }; /* 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 ); + 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 ){ - Jim_GetOpt_NvpUnknown( &goi, target_options, 0 ); + e = Jim_GetOpt_Nvp(&goi, target_options, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(&goi, target_options, 0); return e; } /* Assume blank result */ - Jim_SetEmptyResult( goi.interp ); + Jim_SetEmptyResult(goi.interp); - switch( n->value ){ + switch (n->value){ case TS_CMD_CONFIGURE: - if ( goi.argc < 2 ){ - Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "missing: -option VALUE ..."); + if (goi.argc < 2){ + Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "missing: -option VALUE ..."); return JIM_ERR; } goi.isconfigure = 1; - return target_configure( &goi, target ); + return target_configure(&goi, target); case TS_CMD_CGET: // some things take params - if ( goi.argc < 1 ){ - Jim_WrongNumArgs( goi.interp, 0, goi.argv, "missing: ?-option?"); + if (goi.argc < 1){ + Jim_WrongNumArgs(goi.interp, 0, goi.argv, "missing: ?-option?"); return JIM_ERR; } goi.isconfigure = 0; - return target_configure( &goi, target ); + return target_configure(&goi, target); break; case TS_CMD_MWW: case TS_CMD_MWH: @@ -3789,50 +3789,50 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) * argv[3] = optional count. */ - if ( (goi.argc == 2) || (goi.argc == 3) ){ + if ((goi.argc == 2) || (goi.argc == 3)){ /* all is well */ } else { mwx_error: - Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR DATA [COUNT]", n->name ); + Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR DATA [COUNT]", n->name); return JIM_ERR; } - e = Jim_GetOpt_Wide( &goi, &a ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &a); + if (e != JIM_OK){ goto mwx_error; } - e = Jim_GetOpt_Wide( &goi, &b ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &b); + if (e != JIM_OK){ goto mwx_error; } if (goi.argc == 3) { - e = Jim_GetOpt_Wide( &goi, &c ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &c); + if (e != JIM_OK){ goto mwx_error; } } else { c = 1; } - switch( n->value ){ + switch (n->value){ case TS_CMD_MWW: - target_buffer_set_u32( target, target_buf, b ); + target_buffer_set_u32(target, target_buf, b); b = 4; break; case TS_CMD_MWH: - target_buffer_set_u16( target, target_buf, b ); + target_buffer_set_u16(target, target_buf, b); b = 2; break; case TS_CMD_MWB: - target_buffer_set_u8( target, target_buf, b ); + target_buffer_set_u8(target, target_buf, b); b = 1; break; } - for( x = 0 ; x < c ; x++ ){ - e = target_write_memory( target, a, b, 1, target_buf ); - if ( e != ERROR_OK ){ - Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e ); + for (x = 0 ; x < c ; x++){ + e = target_write_memory(target, a, b, 1, target_buf); + if (e != ERROR_OK){ + Jim_SetResult_sprintf(interp, "Error writing @ 0x%08x: %d\n", (int)(a), e); return JIM_ERR; } /* b = width */ @@ -3849,24 +3849,24 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) * argv[1] = address * argv[2] = optional count */ - if ( (goi.argc == 2) || (goi.argc == 3) ){ - Jim_SetResult_sprintf( goi.interp, "expected: %s ADDR [COUNT]", n->name ); + 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 ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &a); + if (e != JIM_OK){ return JIM_ERR; } - if ( goi.argc ){ - e = Jim_GetOpt_Wide( &goi, &c ); - if ( e != JIM_OK ){ + if (goi.argc){ + e = Jim_GetOpt_Wide(&goi, &c); + if (e != JIM_OK){ return JIM_ERR; } } else { c = 1; } b = 1; /* shut up gcc */ - switch( n->value ){ + switch (n->value){ case TS_CMD_MDW: b = 4; break; @@ -3881,52 +3881,52 @@ 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' */ - while( c > 0 ){ + while (c > 0){ y = c; - if ( y > 16 ){ + if (y > 16){ y = 16; } - e = target_read_memory( target, a, b, y / b, target_buf ); - if ( e != ERROR_OK ){ - Jim_SetResult_sprintf( interp, "error reading target @ 0x%08lx", (int)(a) ); + e = target_read_memory(target, a, b, y / b, target_buf); + 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) ); - switch( b ){ + Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a)); + switch (b){ case 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) ); + 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)); } - for( ; (x < 16) ; x += 4 ){ - Jim_fprintf( interp, interp->cookie_stdout, " " ); + for (; (x < 16) ; x += 4){ + Jim_fprintf(interp, interp->cookie_stdout, " "); } break; case 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) ); + 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)); } - for( ; (x < 16) ; x += 2 ){ - Jim_fprintf( interp, interp->cookie_stdout, " " ); + for (; (x < 16) ; x += 2){ + Jim_fprintf(interp, interp->cookie_stdout, " "); } break; case 1: default: - 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) ); + 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)); } - for( ; (x < 16) ; x += 1 ){ - Jim_fprintf( interp, interp->cookie_stdout, " " ); + for (; (x < 16) ; x += 1){ + Jim_fprintf(interp, interp->cookie_stdout, " "); } break; } /* ascii-ify the bytes */ - for( x = 0 ; x < y ; x++ ){ - if ( (target_buf[x] >= 0x20) && - (target_buf[x] <= 0x7e) ){ + for (x = 0 ; x < y ; x++){ + if ((target_buf[x] >= 0x20) && + (target_buf[x] <= 0x7e)){ /* good */ } else { /* smack it */ @@ -3934,70 +3934,70 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) } } /* space pad */ - while( x < 16 ){ + while (x < 16){ target_buf[x] = ' '; x++; } /* terminate */ target_buf[16] = 0; /* print - with a newline */ - Jim_fprintf( interp, interp->cookie_stdout, "%s\n", target_buf ); + Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf); /* NEXT... */ c -= 16; a += 16; } return JIM_OK; case TS_CMD_MEM2ARRAY: - return target_mem2array( goi.interp, target, goi.argc, goi.argv ); + return target_mem2array(goi.interp, target, goi.argc, goi.argv); break; case TS_CMD_ARRAY2MEM: - return target_array2mem( goi.interp, target, goi.argc, goi.argv ); + return target_array2mem(goi.interp, target, goi.argc, goi.argv); break; case TS_CMD_EXAMINE: - if ( goi.argc ){ - Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]"); + 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 ); - if ( e != ERROR_OK ){ - Jim_SetResult_sprintf( interp, "examine-fails: %d", e ); + e = target->type->examine(target); + if (e != ERROR_OK){ + Jim_SetResult_sprintf(interp, "examine-fails: %d", e); return JIM_ERR; } return JIM_OK; case TS_CMD_POLL: - if ( goi.argc ){ - Jim_WrongNumArgs( goi.interp, 2, argv, "[no parameters]"); + if (goi.argc){ + 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 = target->type->poll(target); } - if ( e != ERROR_OK ){ - Jim_SetResult_sprintf( interp, "poll-fails: %d", e ); + if (e != ERROR_OK){ + Jim_SetResult_sprintf(interp, "poll-fails: %d", e); return JIM_ERR; } else { return JIM_OK; } 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 ); - if ( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( &goi, nvp_assert, 1 ); + e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1); return e; } /* the halt or not param */ - e = Jim_GetOpt_Wide( &goi, &a); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &a); + if (e != JIM_OK){ return e; } if (!target->tap->enabled) @@ -4008,45 +4008,45 @@ 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 */ - if ( n->value == NVP_ASSERT ){ - target->type->assert_reset( target ); + if (n->value == NVP_ASSERT){ + target->type->assert_reset(target); } else { - target->type->deassert_reset( target ); + target->type->deassert_reset(target); } return JIM_OK; case TS_CMD_HALT: - if ( goi.argc ){ - Jim_WrongNumArgs( goi.interp, 0, argv, "halt [no parameters]"); + if (goi.argc){ + Jim_WrongNumArgs(goi.interp, 0, argv, "halt [no parameters]"); return JIM_ERR; } if (!target->tap->enabled) goto err_tap_disabled; - target->type->halt( target ); + target->type->halt(target); return JIM_OK; case TS_CMD_WAITSTATE: /* params: statename timeoutmsecs */ - if ( goi.argc != 2 ){ - Jim_SetResult_sprintf( goi.interp, "%s STATENAME TIMEOUTMSECS", n->name ); + 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 ); - if ( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( &goi, nvp_target_state,1 ); + e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(&goi, nvp_target_state,1); return e; } - e = Jim_GetOpt_Wide( &goi, &a ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &a); + if (e != JIM_OK){ return e; } if (!target->tap->enabled) goto err_tap_disabled; - e = target_wait_state( target, n->value, a ); - if ( e != ERROR_OK ){ - Jim_SetResult_sprintf( goi.interp, + e = target_wait_state(target, n->value, a); + if (e != ERROR_OK){ + Jim_SetResult_sprintf(goi.interp, "target: %s wait %s fails (%d) %s", target->cmd_name, n->name, - e, target_strerror_safe(e) ); + e, target_strerror_safe(e)); return JIM_ERR; } else { return JIM_OK; @@ -4058,40 +4058,40 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) { target_event_action_t *teap; teap = target->event_action; - command_print( cmd_ctx, "Event actions for target (%d) %s\n", + command_print(cmd_ctx, "Event actions for target (%d) %s\n", target->target_number, - target->cmd_name ); - command_print( cmd_ctx, "%-25s | Body", "Event"); - command_print( cmd_ctx, "------------------------- | ----------------------------------------"); - while( teap ){ - command_print( cmd_ctx, + target->cmd_name); + command_print(cmd_ctx, "%-25s | Body", "Event"); + command_print(cmd_ctx, "------------------------- | ----------------------------------------"); + while (teap){ + command_print(cmd_ctx, "%-25s | %s", - Jim_Nvp_value2name_simple( nvp_target_event, teap->event )->name, - Jim_GetString( teap->body, NULL ) ); + Jim_Nvp_value2name_simple(nvp_target_event, teap->event)->name, + Jim_GetString(teap->body, NULL)); teap = teap->next; } - command_print( cmd_ctx, "***END***"); + command_print(cmd_ctx, "***END***"); return JIM_OK; } case TS_CMD_CURSTATE: - if ( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 0, argv, "[no parameters]"); + if (goi.argc != 0){ + Jim_WrongNumArgs(goi.interp, 0, argv, "[no parameters]"); return JIM_ERR; } - Jim_SetResultString( goi.interp, + Jim_SetResultString(goi.interp, Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1); return JIM_OK; case TS_CMD_INVOKE_EVENT: - if ( goi.argc != 1 ){ - Jim_SetResult_sprintf( goi.interp, "%s ?EVENTNAME?",n->name); + 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 ); - if ( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( &goi, nvp_target_event, 1 ); + e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1); return e; } - target_handle_event( target, n->value ); + target_handle_event(target, n->value); return JIM_OK; } return JIM_ERR; @@ -4101,7 +4101,7 @@ err_tap_disabled: return JIM_ERR; } -static int target_create( Jim_GetOptInfo *goi ) +static int target_create(Jim_GetOptInfo *goi) { Jim_Obj *new_cmd; Jim_Cmd *cmd; @@ -4113,44 +4113,44 @@ static int target_create( Jim_GetOptInfo *goi ) struct command_context_s *cmd_ctx; cmd_ctx = Jim_GetAssocData(goi->interp, "context"); - if ( goi->argc < 3 ){ - Jim_WrongNumArgs( goi->interp, 1, goi->argv, "?name? ?type? ..options..."); + if (goi->argc < 3){ + Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ?type? ..options..."); return JIM_ERR; } /* COMMAND */ - Jim_GetOpt_Obj( goi, &new_cmd ); + Jim_GetOpt_Obj(goi, &new_cmd); /* does this command exist? */ - cmd = Jim_GetCommand( goi->interp, new_cmd, JIM_ERRMSG ); - if ( cmd ){ - cp = Jim_GetString( new_cmd, NULL ); + cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG); + if (cmd){ + cp = Jim_GetString(new_cmd, NULL); Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp); return JIM_ERR; } /* TYPE */ - e = Jim_GetOpt_String( goi, &cp2, NULL ); + 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; } } - if ( target_types[x] == NULL ){ - 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] ){ - Jim_AppendStrings( goi->interp, + if (target_types[x] == NULL){ + 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]){ + Jim_AppendStrings(goi->interp, Jim_GetResult(goi->interp), target_types[x]->name, ", ", NULL); } else { - Jim_AppendStrings( goi->interp, + Jim_AppendStrings(goi->interp, Jim_GetResult(goi->interp), " or ", - target_types[x]->name,NULL ); + target_types[x]->name,NULL); } } return JIM_ERR; @@ -4164,7 +4164,7 @@ static int target_create( Jim_GetOptInfo *goi ) /* allocate memory for each unique target type */ target->type = (target_type_t*)calloc(1,sizeof(target_type_t)); - memcpy( target->type, target_types[x], sizeof(target_type_t)); + memcpy(target->type, target_types[x], sizeof(target_type_t)); /* will be set by "-endian" */ target->endianness = TARGET_ENDIAN_UNKNOWN; @@ -4201,21 +4201,21 @@ static int target_create( Jim_GetOptInfo *goi ) /* Do the rest as "configure" options */ goi->isconfigure = 1; - e = target_configure( goi, target); + e = target_configure(goi, target); if (target->tap == NULL) { - Jim_SetResultString( interp, "-chain-position required when creating target", -1); - e=JIM_ERR; + Jim_SetResultString(interp, "-chain-position required when creating target", -1); + e = JIM_ERR; } - if ( e != JIM_OK ){ - free( target->type ); - free( target ); + if (e != JIM_OK){ + 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; } @@ -4225,38 +4225,38 @@ static int target_create( Jim_GetOptInfo *goi ) target->variant = strdup(""); /* create the target specific commands */ - if ( target->type->register_commands ){ - (*(target->type->register_commands))( cmd_ctx ); + if (target->type->register_commands){ + (*(target->type->register_commands))(cmd_ctx); } - if ( target->type->target_create ){ - (*(target->type->target_create))( target, goi->interp ); + if (target->type->target_create){ + (*(target->type->target_create))(target, goi->interp); } /* append to end of list */ { target_t **tpp; tpp = &(all_targets); - while( *tpp ){ - tpp = &( (*tpp)->next ); + while (*tpp){ + tpp = &((*tpp)->next); } *tpp = target; } - cp = Jim_GetString( new_cmd, NULL ); + cp = Jim_GetString(new_cmd, NULL); target->cmd_name = strdup(cp); /* now - create the new target name command */ - e = Jim_CreateCommand( goi->interp, + e = Jim_CreateCommand(goi->interp, /* name */ cp, tcl_target_func, /* C function */ target, /* private data */ - NULL ); /* no del proc */ + NULL); /* no del proc */ return e; } -static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) +static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { int x,r,e; jim_wide w; @@ -4281,91 +4281,91 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) LOG_DEBUG("Target command params:"); LOG_DEBUG("%s", Jim_Debug_ArgvString(interp, argc, 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 ); - if ( r != JIM_OK ){ + /* Jim_GetOpt_Debug(&goi); */ + r = Jim_GetOpt_Enum(&goi, target_cmds, &x); + if (r != JIM_OK){ return r; } - switch(x){ + switch (x){ default: Jim_Panic(goi.interp,"Why am I here?"); return JIM_ERR; case TG_CMD_CURRENT: - if ( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters"); + 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 ); + Jim_SetResultString(goi.interp, get_current_target(cmd_ctx)->cmd_name, -1); return JIM_OK; case TG_CMD_TYPES: - if ( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" ); + 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 ) ); - for( x = 0 ; target_types[x] ; x++ ){ - Jim_ListAppendElement( goi.interp, + Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0)); + for (x = 0 ; target_types[x] ; x++){ + Jim_ListAppendElement(goi.interp, Jim_GetResult(goi.interp), - Jim_NewStringObj( goi.interp, target_types[x]->name, -1 ) ); + Jim_NewStringObj(goi.interp, target_types[x]->name, -1)); } return JIM_OK; case TG_CMD_NAMES: - if ( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 1, goi.argv, "Too many parameters" ); + 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_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0)); target = all_targets; - while( target ){ - Jim_ListAppendElement( goi.interp, + while (target){ + Jim_ListAppendElement(goi.interp, Jim_GetResult(goi.interp), - Jim_NewStringObj( goi.interp, target->cmd_name, -1 ) ); + Jim_NewStringObj(goi.interp, target->cmd_name, -1)); target = target->next; } return JIM_OK; case TG_CMD_CREATE: - if ( goi.argc < 3 ){ - Jim_WrongNumArgs( goi.interp, goi.argc, goi.argv, "?name ... config options ..."); + if (goi.argc < 3){ + Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "?name ... config options ..."); return JIM_ERR; } - return target_create( &goi ); + return target_create(&goi); break; case TG_CMD_NUMBER: - if ( goi.argc != 1 ){ - Jim_SetResult_sprintf( goi.interp, "expected: target number ?NUMBER?"); + if (goi.argc != 1){ + Jim_SetResult_sprintf(goi.interp, "expected: target number ?NUMBER?"); return JIM_ERR; } - e = Jim_GetOpt_Wide( &goi, &w ); - if ( e != JIM_OK ){ + e = Jim_GetOpt_Wide(&goi, &w); + if (e != JIM_OK){ return JIM_ERR; } { target_t *t; t = get_target_by_num(w); - if ( t == NULL ){ - Jim_SetResult_sprintf( goi.interp,"Target: number %d does not exist", (int)(w)); + if (t == NULL){ + Jim_SetResult_sprintf(goi.interp,"Target: number %d does not exist", (int)(w)); return JIM_ERR; } - Jim_SetResultString( goi.interp, t->cmd_name, -1 ); + Jim_SetResultString(goi.interp, t->cmd_name, -1); return JIM_OK; } case TG_CMD_COUNT: - if ( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 0, goi.argv, ""); + if (goi.argc != 0){ + Jim_WrongNumArgs(goi.interp, 0, goi.argv, ""); return JIM_ERR; } - Jim_SetResult( goi.interp, - Jim_NewIntObj( goi.interp, max_target_number())); + Jim_SetResult(goi.interp, + Jim_NewIntObj(goi.interp, max_target_number())); return JIM_OK; } @@ -4386,16 +4386,16 @@ static struct FastLoad *fastload; static void free_fastload(void) { - if (fastload!=NULL) + if (fastload != NULL) { int i; - for (i=0; i=min_address)&& - (image.sections[i].base_address= min_address)&& + (image.sections[i].base_address < max_address)) { - if (image.sections[i].base_addressmax_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; } - 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, - ((unsigned int)(image.sections[i].base_address+offset))); + ((unsigned int)(image.sections[i].base_address + offset))); } 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."); @@ -4504,7 +4504,7 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha image_close(&image); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) { free_fastload(); } @@ -4514,30 +4514,30 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - if (argc>0) + 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; - int ms=timeval_ms(); - int size=0; - int retval=ERROR_OK; - for (i=0; i