diff options
author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:47:42 +0000 |
---|---|---|
committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:47:42 +0000 |
commit | dc575dc5bf8cb597a0e9a47794744ae6b1928087 (patch) | |
tree | 325ee3b79fe5801fd11a9cfa5e848ea15a52d5eb /src/jtag/tcl.c | |
parent | f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1 (diff) |
Remove whitespace that occurs before ')'.
- Replace '[ \t]*[)]' with ')'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2377 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/tcl.c')
-rw-r--r-- | src/jtag/tcl.c | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 4422111b..aad67811 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -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; @@ -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,7 +385,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi ) { uint32_t *new_expected_ids; - e = Jim_GetOpt_Wide(goi, &w ); + e = Jim_GetOpt_Wide(goi, &w); if (e != JIM_OK) { Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name); return e; @@ -409,9 +409,9 @@ 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){ @@ -441,7 +441,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi ) break; } } /* switch (n->value) */ - } /* while (goi->argc ) */ + } /* while (goi->argc) */ /* default is enabled-after-reset */ pTap->enabled = !pTap->disabled_after_reset; @@ -475,7 +475,7 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e) 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 { @@ -498,7 +498,7 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e) } -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 ){ + 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 ){ + 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 ){ + 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,7 +619,7 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv ) break; case JTAG_CMD_CGET: - if (goi.argc < 2 ){ + if (goi.argc < 2){ Jim_WrongNumArgs(goi.interp, 0, NULL, "?tap-name? -option ..."); return JIM_ERR; } @@ -628,8 +628,8 @@ 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; } @@ -639,7 +639,7 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv ) break; case JTAG_CMD_CONFIGURE: - if (goi.argc < 3 ){ + if (goi.argc < 3){ Jim_WrongNumArgs(goi.interp, 0, NULL, "?tap-name? -option ?VALUE? ..."); return JIM_ERR; } @@ -648,8 +648,8 @@ 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; } @@ -806,7 +806,7 @@ 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 ){ + if (argc < 4){ command_print(cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax"); return ERROR_OK; } @@ -814,41 +814,41 @@ static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *c command_print(cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s", args[0], args[1], - args[2] ); + 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 ); + 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 ) ); + 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); @@ -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] ); + 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; @@ -1281,12 +1281,12 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args 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,13 +1321,13 @@ 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; } @@ -1399,12 +1399,12 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar for (i = 0; i < argc-1; i++) { const char *cp; - cp = Jim_GetString(args[i + 1], NULL ); + cp = Jim_GetString(args[i + 1], NULL); states[i] = tap_state_by_name(cp); - if (states[i] < 0 ) + if (states[i] < 0) { /* update the error message */ - Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp ); + Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp); return JIM_ERR; } } |