diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-26 11:00:03 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-28 13:00:39 -0800 |
| commit | 4ff5eda576d75ee57ba448d2136867c791d215a8 (patch) | |
| tree | 578dd7bed4aacb1cfc01e2bbbb62f842364054d2 | |
| parent | 0377e5b54d6db196cfeeaaa70824c581317e2290 (diff) | |
| download | openocd_libswd-4ff5eda576d75ee57ba448d2136867c791d215a8.tar.gz openocd_libswd-4ff5eda576d75ee57ba448d2136867c791d215a8.tar.bz2 openocd_libswd-4ff5eda576d75ee57ba448d2136867c791d215a8.tar.xz openocd_libswd-4ff5eda576d75ee57ba448d2136867c791d215a8.zip | |
improve jtag_tap_handle_event indentation
Use 'continue' to reduce identation levels and superfluous logic.
| -rw-r--r-- | src/jtag/tcl.c | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 929c784e..83719671 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -571,29 +571,36 @@ static void jtag_tap_handle_event(struct jtag_tap *tap, enum jtag_event e) { struct jtag_tap_event_action * jteap; - for (jteap = tap->event_action; jteap != NULL; jteap = jteap->next) { - if (jteap->event == e) { - LOG_DEBUG("JTAG tap: %s event: %d (%s)\n\taction: %s", - tap->dotted_name, - e, - Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name, - Jim_GetString(jteap->body, NULL)); - if (Jim_EvalObj(interp, jteap->body) != JIM_OK) { - Jim_PrintErrorMessage(interp); - } else switch (e) { - case JTAG_TAP_EVENT_ENABLE: - case JTAG_TAP_EVENT_DISABLE: - /* NOTE: we currently assume the handlers - * can't fail. Right here is where we should - * really be verifying the scan chains ... - */ - tap->enabled = (e == JTAG_TAP_EVENT_ENABLE); - LOG_INFO("JTAG tap: %s %s", tap->dotted_name, - tap->enabled ? "enabled" : "disabled"); - break; - default: - break; - } + for (jteap = tap->event_action; jteap != NULL; jteap = jteap->next) + { + if (jteap->event != e) + continue; + + Jim_Nvp *nvp = Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e); + LOG_DEBUG("JTAG tap: %s event: %d (%s)\n\taction: %s", + tap->dotted_name, e, nvp->name, + Jim_GetString(jteap->body, NULL)); + + if (Jim_EvalObj(interp, jteap->body) != JIM_OK) + { + Jim_PrintErrorMessage(interp); + continue; + } + + switch (e) + { + case JTAG_TAP_EVENT_ENABLE: + case JTAG_TAP_EVENT_DISABLE: + /* NOTE: we currently assume the handlers + * can't fail. Right here is where we should + * really be verifying the scan chains ... + */ + tap->enabled = (e == JTAG_TAP_EVENT_ENABLE); + LOG_INFO("JTAG tap: %s %s", tap->dotted_name, + tap->enabled ? "enabled" : "disabled"); + break; + default: + break; } } } |