X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Ftcl.c;h=aad6781118cba2fbd32a2fc2113771a8f8705ce1;hp=010b375f07f58985be3c184f3e46c4643a144a0b;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=86e4324f1bd4cd8135cb857e4b940b1f2e872dc3 diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 010b375f07..aad6781118 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -209,7 +209,7 @@ static Jim_Nvp nvp_config_opts[] = { { .name = NULL, .value = -1 } }; -static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap) +static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, jtag_tap_t * tap) { Jim_Nvp *n; Jim_Obj *o; @@ -228,11 +228,11 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap) switch (n->value) { case JCFG_EVENT: if (goi->argc == 0) { - Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ..." ); + Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ..."); return JIM_ERR; } - e = Jim_GetOpt_Nvp( goi, nvp_jtag_tap_event, &n ); + e = Jim_GetOpt_Nvp(goi, nvp_jtag_tap_event, &n); if (e != JIM_OK) { Jim_GetOpt_NvpUnknown(goi, nvp_jtag_tap_event, 1); return e; @@ -268,7 +268,7 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap) jteap = calloc(1, sizeof (*jteap)); } jteap->event = n->value; - Jim_GetOpt_Obj( goi, &o); + Jim_GetOpt_Obj(goi, &o); if (jteap->body) { Jim_DecrRefCount(interp, jteap->body); } @@ -306,7 +306,7 @@ static int is_bad_irval(int ir_length, jim_wide w) return (w & v) != 0; } -static int jim_newtap_cmd( Jim_GetOptInfo *goi ) +static int jim_newtap_cmd(Jim_GetOptInfo *goi) { jtag_tap_t *pTap; jim_wide w; @@ -340,20 +340,20 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi ) /* * we expect CHIP + TAP + OPTIONS * */ - if( goi->argc < 3 ){ + if (goi->argc < 3){ Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ...."); return JIM_ERR; } - Jim_GetOpt_String( goi, &cp, NULL ); + Jim_GetOpt_String(goi, &cp, NULL); pTap->chip = strdup(cp); - Jim_GetOpt_String( goi, &cp, NULL ); + Jim_GetOpt_String(goi, &cp, NULL); pTap->tapname = strdup(cp); /* name + dot + name + null */ x = strlen(pTap->chip) + 1 + strlen(pTap->tapname) + 1; - cp = malloc( x ); - sprintf( cp, "%s.%s", pTap->chip, pTap->tapname ); + cp = malloc(x); + sprintf(cp, "%s.%s", pTap->chip, pTap->tapname); pTap->dotted_name = cp; LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params", @@ -367,14 +367,14 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi ) /* clear them as we find them */ reqbits = (NTREQ_IRLEN | NTREQ_IRCAPTURE | NTREQ_IRMASK); - while( goi->argc ){ - e = Jim_GetOpt_Nvp( goi, opts, &n ); - if( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( goi, opts, 0 ); + while (goi->argc){ + e = Jim_GetOpt_Nvp(goi, opts, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(goi, opts, 0); return e; } - LOG_DEBUG("Processing option: %s", n->name ); - switch( n->value ){ + LOG_DEBUG("Processing option: %s", n->name); + switch (n->value){ case NTAP_OPT_ENABLED: pTap->disabled_after_reset = false; break; @@ -385,15 +385,15 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi ) { uint32_t *new_expected_ids; - e = Jim_GetOpt_Wide( goi, &w ); - if( e != JIM_OK) { + e = Jim_GetOpt_Wide(goi, &w); + if (e != JIM_OK) { Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name); return e; } new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1)); if (new_expected_ids == NULL) { - Jim_SetResult_sprintf( goi->interp, "no memory"); + Jim_SetResult_sprintf(goi->interp, "no memory"); return JIM_ERR; } @@ -409,12 +409,12 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi ) case NTAP_OPT_IRLEN: case NTAP_OPT_IRMASK: case NTAP_OPT_IRCAPTURE: - e = Jim_GetOpt_Wide( goi, &w ); - if( e != JIM_OK ){ - Jim_SetResult_sprintf( goi->interp, "option: %s bad parameter", n->name ); + e = Jim_GetOpt_Wide(goi, &w); + if (e != JIM_OK){ + Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name); return e; } - switch(n->value){ + switch (n->value){ case NTAP_OPT_IRLEN: if (w > (jim_wide) (8 * sizeof(pTap->ir_capture_value))) LOG_WARNING("huge IR length %d", (int) w); @@ -440,8 +440,8 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi ) reqbits &= (~(NTREQ_IRCAPTURE)); break; } - } /* switch(n->value) */ - } /* while( goi->argc ) */ + } /* switch (n->value) */ + } /* while (goi->argc) */ /* default is enabled-after-reset */ pTap->enabled = !pTap->disabled_after_reset; @@ -471,11 +471,11 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e) while (jteap) { if (jteap->event == e) { done = 1; - LOG_DEBUG( "JTAG tap: %s event: %d (%s) action: %s\n", + LOG_DEBUG("JTAG tap: %s event: %d (%s) action: %s\n", tap->dotted_name, e, Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name, - Jim_GetString(jteap->body, NULL) ); + Jim_GetString(jteap->body, NULL)); if (Jim_EvalObj(interp, jteap->body) != JIM_OK) { Jim_PrintErrorMessage(interp); } else { @@ -491,14 +491,14 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e) } if (!done) { - LOG_DEBUG( "event %d %s - no action", + LOG_DEBUG("event %d %s - no action", e, - Jim_Nvp_value2name_simple( nvp_jtag_tap_event, e)->name); + Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name); } } -static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) +static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { Jim_GetOptInfo goi; int e; @@ -532,44 +532,44 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv context = Jim_GetAssocData(interp, "context"); /* go past the command */ - Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 ); + Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1); - e = Jim_GetOpt_Nvp( &goi, jtag_cmds, &n ); - if( e != JIM_OK ){ - Jim_GetOpt_NvpUnknown( &goi, jtag_cmds, 0 ); + e = Jim_GetOpt_Nvp(&goi, jtag_cmds, &n); + if (e != JIM_OK){ + Jim_GetOpt_NvpUnknown(&goi, jtag_cmds, 0); return e; } - Jim_SetEmptyResult( goi.interp ); - switch( n->value ){ + Jim_SetEmptyResult(goi.interp); + switch (n->value){ case JTAG_CMD_INTERFACE: /* return the name of the interface */ /* TCL code might need to know the exact type... */ /* FUTURE: we allow this as a means to "set" the interface. */ - if( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)"); + if (goi.argc != 0){ + Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)"); return JIM_ERR; } - Jim_SetResultString( goi.interp, jtag_interface->name, -1 ); + Jim_SetResultString(goi.interp, jtag_interface->name, -1); return JIM_OK; case JTAG_CMD_INIT_RESET: - if( goi.argc != 0 ){ - Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)"); + if (goi.argc != 0){ + Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)"); return JIM_ERR; } e = jtag_init_reset(context); - if( e != ERROR_OK ){ - Jim_SetResult_sprintf( goi.interp, "error: %d", e); + if (e != ERROR_OK){ + Jim_SetResult_sprintf(goi.interp, "error: %d", e); return JIM_ERR; } return JIM_OK; case JTAG_CMD_NEWTAP: - return jim_newtap_cmd( &goi ); + return jim_newtap_cmd(&goi); break; case JTAG_CMD_TAPISENABLED: case JTAG_CMD_TAPENABLE: case JTAG_CMD_TAPDISABLE: - if( goi.argc != 1 ){ - Jim_SetResultString( goi.interp, "Too many parameters",-1 ); + if (goi.argc != 1){ + Jim_SetResultString(goi.interp, "Too many parameters",-1); return JIM_ERR; } @@ -619,8 +619,8 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv break; case JTAG_CMD_CGET: - if( goi.argc < 2 ){ - Jim_WrongNumArgs( goi.interp, 0, NULL, "?tap-name? -option ..."); + if (goi.argc < 2){ + Jim_WrongNumArgs(goi.interp, 0, NULL, "?tap-name? -option ..."); return JIM_ERR; } @@ -628,19 +628,19 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv jtag_tap_t *t; Jim_GetOpt_Obj(&goi, &o); - t = jtag_tap_by_jim_obj( goi.interp, o ); - if( t == NULL ){ + t = jtag_tap_by_jim_obj(goi.interp, o); + if (t == NULL){ return JIM_ERR; } goi.isconfigure = 0; - return jtag_tap_configure_cmd( &goi, t); + return jtag_tap_configure_cmd(&goi, t); } break; case JTAG_CMD_CONFIGURE: - if( goi.argc < 3 ){ - Jim_WrongNumArgs( goi.interp, 0, NULL, "?tap-name? -option ?VALUE? ..."); + if (goi.argc < 3){ + Jim_WrongNumArgs(goi.interp, 0, NULL, "?tap-name? -option ?VALUE? ..."); return JIM_ERR; } @@ -648,13 +648,13 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv jtag_tap_t *t; Jim_GetOpt_Obj(&goi, &o); - t = jtag_tap_by_jim_obj( goi.interp, o ); - if( t == NULL ){ + t = jtag_tap_by_jim_obj(goi.interp, o); + if (t == NULL){ return JIM_ERR; } goi.isconfigure = 1; - return jtag_tap_configure_cmd( &goi, t); + return jtag_tap_configure_cmd(&goi, t); } } @@ -663,7 +663,7 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv int jtag_register_commands(struct command_context_s *cmd_ctx) { - register_jim( cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions"); + register_jim(cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions"); register_command(cmd_ctx, NULL, "interface", handle_interface_command, COMMAND_CONFIG, "try to configure interface"); @@ -699,11 +699,11 @@ int jtag_register_commands(struct command_context_s *cmd_ctx) register_jim(cmd_ctx, "pathmove", Jim_Command_pathmove, "move JTAG to state1 then to state2, state3, etc. ,,..."); register_command(cmd_ctx, NULL, "verify_ircapture", handle_verify_ircapture_command, - COMMAND_ANY, "verify value captured during Capture-IR "); + COMMAND_ANY, "verify value captured during Capture-IR "); register_command(cmd_ctx, NULL, "verify_jtag", handle_verify_jtag_command, - COMMAND_ANY, "verify value capture "); + COMMAND_ANY, "verify value capture "); register_command(cmd_ctx, NULL, "tms_sequence", handle_tms_sequence_command, - COMMAND_ANY, "choose short(default) or long tms_sequence "); + COMMAND_ANY, "choose short(default) or long tms_sequence "); return ERROR_OK; } @@ -721,13 +721,13 @@ static int default_speed_div(int speed, int *khz) static int default_power_dropout(int *dropout) { - *dropout=0; /* by default we can't detect power dropout */ + *dropout = 0; /* by default we can't detect power dropout */ return ERROR_OK; } static int default_srst_asserted(int *srst_asserted) { - *srst_asserted=0; /* by default we can't detect srst asserted */ + *srst_asserted = 0; /* by default we can't detect srst asserted */ return ERROR_OK; } @@ -806,49 +806,49 @@ static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *c * argv[ 3] = not actually used by anything but in the docs */ - if( argc < 4 ){ - command_print( cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax"); + if (argc < 4){ + command_print(cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax"); return ERROR_OK; } - command_print( cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax"); - command_print( cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s", + command_print(cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax"); + command_print(cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s", args[0], args[1], - args[2] ); - command_print( cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundaryscan(len5)"); - command_print( cmd_ctx, "jtag newtap stm32 cortexm3 ....., thus creating the tap: \"stm32.cortexm3\""); - command_print( cmd_ctx, "jtag newtap stm32 boundary ....., and the tap: \"stm32.boundary\""); - command_print( cmd_ctx, "And then refer to the taps by the dotted name."); - - newargs[0] = Jim_NewStringObj( interp, "jtag", -1 ); - newargs[1] = Jim_NewStringObj( interp, "newtap", -1 ); - sprintf( buf, "chip%d", jtag_tap_count() ); - newargs[2] = Jim_NewStringObj( interp, buf, -1 ); - sprintf( buf, "tap%d", jtag_tap_count() ); - newargs[3] = Jim_NewStringObj( interp, buf, -1 ); - newargs[4] = Jim_NewStringObj( interp, "-irlen", -1 ); - newargs[5] = Jim_NewStringObj( interp, args[0], -1 ); - newargs[6] = Jim_NewStringObj( interp, "-ircapture", -1 ); - newargs[7] = Jim_NewStringObj( interp, args[1], -1 ); - newargs[8] = Jim_NewStringObj( interp, "-irmask", -1 ); - newargs[9] = Jim_NewStringObj( interp, args[2], -1 ); - - command_print( cmd_ctx, "NEW COMMAND:"); - sprintf( buf, "%s %s %s %s %s %s %s %s %s %s", - Jim_GetString( newargs[0], NULL ), - Jim_GetString( newargs[1], NULL ), - Jim_GetString( newargs[2], NULL ), - Jim_GetString( newargs[3], NULL ), - Jim_GetString( newargs[4], NULL ), - Jim_GetString( newargs[5], NULL ), - Jim_GetString( newargs[6], NULL ), - Jim_GetString( newargs[7], NULL ), - Jim_GetString( newargs[8], NULL ), - Jim_GetString( newargs[9], NULL ) ); - - e = jim_jtag_command( interp, 10, newargs ); - if( e != JIM_OK ){ - command_print( cmd_ctx, "%s", Jim_GetString( Jim_GetResult(interp), NULL ) ); + args[2]); + command_print(cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundaryscan(len5)"); + command_print(cmd_ctx, "jtag newtap stm32 cortexm3 ....., thus creating the tap: \"stm32.cortexm3\""); + command_print(cmd_ctx, "jtag newtap stm32 boundary ....., and the tap: \"stm32.boundary\""); + command_print(cmd_ctx, "And then refer to the taps by the dotted name."); + + newargs[0] = Jim_NewStringObj(interp, "jtag", -1); + newargs[1] = Jim_NewStringObj(interp, "newtap", -1); + sprintf(buf, "chip%d", jtag_tap_count()); + newargs[2] = Jim_NewStringObj(interp, buf, -1); + sprintf(buf, "tap%d", jtag_tap_count()); + newargs[3] = Jim_NewStringObj(interp, buf, -1); + newargs[4] = Jim_NewStringObj(interp, "-irlen", -1); + newargs[5] = Jim_NewStringObj(interp, args[0], -1); + newargs[6] = Jim_NewStringObj(interp, "-ircapture", -1); + newargs[7] = Jim_NewStringObj(interp, args[1], -1); + newargs[8] = Jim_NewStringObj(interp, "-irmask", -1); + newargs[9] = Jim_NewStringObj(interp, args[2], -1); + + command_print(cmd_ctx, "NEW COMMAND:"); + sprintf(buf, "%s %s %s %s %s %s %s %s %s %s", + Jim_GetString(newargs[0], NULL), + Jim_GetString(newargs[1], NULL), + Jim_GetString(newargs[2], NULL), + Jim_GetString(newargs[3], NULL), + Jim_GetString(newargs[4], NULL), + Jim_GetString(newargs[5], NULL), + Jim_GetString(newargs[6], NULL), + Jim_GetString(newargs[7], NULL), + Jim_GetString(newargs[8], NULL), + Jim_GetString(newargs[9], NULL)); + + e = jim_jtag_command(interp, 10, newargs); + if (e != JIM_OK){ + command_print(cmd_ctx, "%s", Jim_GetString(Jim_GetResult(interp), NULL)); } return e; } @@ -861,7 +861,7 @@ static int handle_scan_chain_command(struct command_context_s *cmd_ctx, char *cm command_print(cmd_ctx, " TapName | Enabled | IdCode Expected IrLen IrCap IrMask Instr "); command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------"); - while( tap ){ + while (tap){ uint32_t expected, expected_mask, cur_instr, ii; expected = buf_get_u32(tap->expected, 0, tap->ir_length); expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length); @@ -872,16 +872,16 @@ static int handle_scan_chain_command(struct command_context_s *cmd_ctx, char *cm tap->abs_chain_position, tap->dotted_name, tap->enabled ? 'Y' : 'n', - tap->idcode, - (tap->expected_ids_cnt > 0 ? tap->expected_ids[0] : 0), - tap->ir_length, - expected, - expected_mask, - cur_instr); + (unsigned int)(tap->idcode), + (unsigned int)(tap->expected_ids_cnt > 0 ? tap->expected_ids[0] : 0), + (unsigned int)(tap->ir_length), + (unsigned int)(expected), + (unsigned int)(expected_mask), + (unsigned int)(cur_instr)); for (ii = 1; ii < tap->expected_ids_cnt; ii++) { command_print(cmd_ctx, " | | | | 0x%08x | | | | ", - tap->expected_ids[ii]); + (unsigned int)(tap->expected_ids[ii])); } tap = tap->next_tap; @@ -1174,20 +1174,20 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c */ endstate = TAP_IDLE; - if( argc >= 4 ){ + if (argc >= 4){ /* have at least one pair of numbers. */ /* is last pair the magic text? */ - if( 0 == strcmp( "-endstate", args[ argc - 2 ] ) ){ + if (0 == strcmp("-endstate", args[ argc - 2 ])){ const char *cpA; const char *cpS; cpA = args[ argc-1 ]; - for( endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){ - cpS = tap_state_name( endstate ); - if( 0 == strcmp( cpA, cpS ) ){ + for (endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++){ + cpS = tap_state_name(endstate); + if (0 == strcmp(cpA, cpS)){ break; } } - if( endstate >= TAP_NUM_STATES ){ + if (endstate >= TAP_NUM_STATES){ return ERROR_COMMAND_SYNTAX_ERROR; } else { if (!scan_is_safe(endstate)) @@ -1207,10 +1207,10 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c int retval; for (i = 0; i < num_fields; i++) { - tap = jtag_tap_by_string( args[i*2] ); - if (tap==NULL) + tap = jtag_tap_by_string(args[i*2]); + if (tap == NULL) { - command_print( cmd_ctx, "Tap: %s unknown", args[i*2] ); + command_print(cmd_ctx, "Tap: %s unknown", args[i*2]); return ERROR_FAIL; } int field_size = tap->ir_length; @@ -1262,7 +1262,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args * args[N-2] = "-endstate" * args[N-1] = statename */ - if ((argc < 4) || ((argc % 2)!=0)) + if ((argc < 4) || ((argc % 2) != 0)) { Jim_WrongNumArgs(interp, 1, args, "wrong arguments"); return JIM_ERR; @@ -1274,19 +1274,19 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args /* validate arguments as numbers */ e = JIM_OK; - for (i = 2; i < argc; i+=2) + for (i = 2; i < argc; i += 2) { long bits; const char *cp; e = Jim_GetLong(interp, args[i], &bits); /* If valid - try next arg */ - if( e == JIM_OK ){ + if (e == JIM_OK){ continue; } /* Not valid.. are we at the end? */ - if ( ((i+2) != argc) ){ + if (((i + 2) != argc)){ /* nope, then error */ return e; } @@ -1297,17 +1297,17 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args */ /* get arg as a string. */ - cp = Jim_GetString( args[i], NULL ); + cp = Jim_GetString(args[i], NULL); /* is it the magic? */ - if( 0 == strcmp( "-endstate", cp ) ){ + if (0 == strcmp("-endstate", cp)){ /* is the statename valid? */ - cp = Jim_GetString( args[i+1], NULL ); + cp = Jim_GetString(args[i + 1], NULL); /* see if it is a valid state name */ endstate = tap_state_by_name(cp); - if( endstate < 0 ){ + if (endstate < 0){ /* update the error message */ - Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp ); + Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp); } else { if (!scan_is_safe(endstate)) LOG_WARNING("drscan with unsafe " @@ -1321,26 +1321,26 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args } /* Still an error? */ - if( e != JIM_OK ){ + if (e != JIM_OK){ return e; /* too bad */ } } /* validate args */ - tap = jtag_tap_by_jim_obj( interp, args[1] ); - if( tap == NULL ){ + tap = jtag_tap_by_jim_obj(interp, args[1]); + if (tap == NULL){ return JIM_ERR; } - num_fields=(argc-2)/2; + num_fields = (argc-2)/2; fields = malloc(sizeof(scan_field_t) * num_fields); - for (i = 2; i < argc; i+=2) + for (i = 2; i < argc; i += 2) { long bits; int len; const char *str; Jim_GetLong(interp, args[i], &bits); - str = Jim_GetString(args[i+1], &len); + str = Jim_GetString(args[i + 1], &len); fields[field_count].tap = tap; fields[field_count].num_bits = bits; @@ -1359,9 +1359,9 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args return JIM_ERR; } - field_count=0; + field_count = 0; Jim_Obj *list = Jim_NewListObj(interp, NULL, 0); - for (i = 2; i < argc; i+=2) + for (i = 2; i < argc; i += 2) { long bits; char *str; @@ -1387,7 +1387,7 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar { tap_state_t states[8]; - if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states)+1))) + if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states) + 1))) { Jim_WrongNumArgs(interp, 1, args, "wrong arguments"); return JIM_ERR; @@ -1396,26 +1396,26 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar script_debug(interp, "pathmove", argc, args); int i; - for (i=0; i