diff options
| author | Marc Schink <dev@zapb.de> | 2021-05-29 12:09:28 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-06-04 17:46:48 +0100 |
| commit | bb81ec8bf00f2d8cc0719cef802a367b4dc286e6 (patch) | |
| tree | 09820a748700d36eb6c1a2066de2fffcdc8d2fa5 | |
| parent | 6a49b1ce2344c8707e322565ff0e5254762353fd (diff) | |
| download | riscv-openocd-bb81ec8bf00f2d8cc0719cef802a367b4dc286e6.zip riscv-openocd-bb81ec8bf00f2d8cc0719cef802a367b4dc286e6.tar.gz riscv-openocd-bb81ec8bf00f2d8cc0719cef802a367b4dc286e6.tar.bz2 | |
target/startup.tcl: Do not use 'Yoda conditions'
Change-Id: I5e1bbaf032659dda1b365ef4ec6ea4a635d921ce
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6284
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
| -rw-r--r-- | src/target/startup.tcl | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/target/startup.tcl b/src/target/startup.tcl index 54a3942..cd98d68 100644 --- a/src/target/startup.tcl +++ b/src/target/startup.tcl @@ -30,18 +30,17 @@ proc ocd_process_reset_inner { MODE } { set targets [target names] # If this target must be halted... - set halt -1 - if { 0 == [string compare $MODE halt] } { - set halt 1 - } - if { 0 == [string compare $MODE init] } { - set halt 1; - } - if { 0 == [string compare $MODE run ] } { - set halt 0; - } - if { $halt < 0 } { - return -code error "Invalid mode: $MODE, must be one of: halt, init, or run"; + switch $MODE { + halt - + init { + set halt 1 + } + run { + set halt 0 + } + default { + return -code error "Invalid mode: $MODE, must be one of: halt, init, or run"; + } } # Target event handlers *might* change which TAPs are enabled @@ -130,14 +129,14 @@ proc ocd_process_reset_inner { MODE } { # Did we succeed? set s [$t curstate] - if { 0 != [string compare $s "halted" ] } { + if { $s != "halted" } { return -code error [format "TARGET: %s - Not halted" $t] } } } #Pass 2 - if needed "init" - if { 0 == [string compare init $MODE] } { + if { $MODE == "init" } { foreach t $targets { if {[using_jtag] && ![jtag tapisenabled [$t cget -chain-position]]} { continue |