summaryrefslogtreecommitdiff
path: root/src/jtag
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:49:06 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:49:06 +0000
commitc493543fc93cb693abab3146e08314b63d137470 (patch)
treeb6cf56fb5a2cc0d0f7460bae8bd3acec8ceca6f8 /src/jtag
parentdc575dc5bf8cb597a0e9a47794744ae6b1928087 (diff)
downloadopenocd+libswd-c493543fc93cb693abab3146e08314b63d137470.tar.gz
openocd+libswd-c493543fc93cb693abab3146e08314b63d137470.tar.bz2
openocd+libswd-c493543fc93cb693abab3146e08314b63d137470.tar.xz
openocd+libswd-c493543fc93cb693abab3146e08314b63d137470.zip
- Replace '){' with ') {'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2378 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
-rw-r--r--src/jtag/core.c12
-rw-r--r--src/jtag/interface.c4
-rw-r--r--src/jtag/tcl.c60
3 files changed, 38 insertions, 38 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 330eb783..b13b4880 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -704,7 +704,7 @@ int jtag_check_value_inner(uint8_t *captured, uint8_t *in_check_value, uint8_t *
else
compare_failed = buf_cmp(captured, in_check_value, num_bits);
- if (compare_failed){
+ if (compare_failed) {
/* An error handler could have caught the failing check
* only report a problem when there wasn't a handler, or if the handler
* acknowledged the error
@@ -1024,9 +1024,9 @@ int jtag_validate_chain(void)
tap = NULL;
total_ir_length = 0;
- for (;;){
+ for (;;) {
tap = jtag_tap_next_enabled(tap);
- if (tap == NULL){
+ if (tap == NULL) {
break;
}
total_ir_length += tap->ir_length;
@@ -1048,9 +1048,9 @@ int jtag_validate_chain(void)
tap = NULL;
chain_pos = 0;
int val;
- for (;;){
+ for (;;) {
tap = jtag_tap_next_enabled(tap);
- if (tap == NULL){
+ if (tap == NULL) {
break;
}
@@ -1151,7 +1151,7 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
LOG_DEBUG("Init JTAG chain");
tap = jtag_tap_next_enabled(NULL);
- if (tap == NULL){
+ if (tap == NULL) {
LOG_ERROR("There are no enabled taps?");
return ERROR_JTAG_INIT_FAILED;
}
diff --git a/src/jtag/interface.c b/src/jtag/interface.c
index b78ffdec..1511dfeb 100644
--- a/src/jtag/interface.c
+++ b/src/jtag/interface.c
@@ -359,9 +359,9 @@ tap_state_t tap_state_by_name(const char *name)
{
tap_state_t x;
- for (x = 0 ; x < TAP_NUM_STATES ; x++){
+ for (x = 0 ; x < TAP_NUM_STATES ; x++) {
/* be nice to the human */
- if (0 == strcasecmp(name, tap_state_name(x))){
+ if (0 == strcasecmp(name, tap_state_name(x))) {
return x;
}
}
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index aad67811..2ea3868d 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -340,7 +340,7 @@ 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;
}
@@ -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){
+ while (goi->argc) {
e = Jim_GetOpt_Nvp(goi, opts, &n);
- if (e != JIM_OK){
+ if (e != JIM_OK) {
Jim_GetOpt_NvpUnknown(goi, opts, 0);
return e;
}
LOG_DEBUG("Processing option: %s", n->name);
- switch (n->value){
+ switch (n->value) {
case NTAP_OPT_ENABLED:
pTap->disabled_after_reset = false;
break;
@@ -410,11 +410,11 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
case NTAP_OPT_IRMASK:
case NTAP_OPT_IRCAPTURE:
e = Jim_GetOpt_Wide(goi, &w);
- if (e != JIM_OK){
+ 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);
@@ -535,29 +535,29 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
e = Jim_GetOpt_Nvp(&goi, jtag_cmds, &n);
- if (e != JIM_OK){
+ if (e != JIM_OK) {
Jim_GetOpt_NvpUnknown(&goi, jtag_cmds, 0);
return e;
}
Jim_SetEmptyResult(goi.interp);
- switch (n->value){
+ 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);
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;
}
@@ -568,7 +568,7 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
case JTAG_CMD_TAPISENABLED:
case JTAG_CMD_TAPENABLE:
case JTAG_CMD_TAPDISABLE:
- if (goi.argc != 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;
}
@@ -629,7 +629,7 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_GetOpt_Obj(&goi, &o);
t = jtag_tap_by_jim_obj(goi.interp, o);
- if (t == NULL){
+ 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;
}
@@ -649,7 +649,7 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_GetOpt_Obj(&goi, &o);
t = jtag_tap_by_jim_obj(goi.interp, o);
- if (t == NULL){
+ 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;
}
@@ -847,7 +847,7 @@ static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *c
Jim_GetString(newargs[9], NULL));
e = jim_jtag_command(interp, 10, newargs);
- if (e != JIM_OK){
+ 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++){
+ for (endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++) {
cpS = tap_state_name(endstate);
- if (0 == strcmp(cpA, cpS)){
+ 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))
@@ -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;
}
@@ -1299,13 +1299,13 @@ 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);
/* 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);
/* 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);
} else {
@@ -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){
+ if (tap == NULL) {
return JIM_ERR;
}