interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Marc Schink 2021-05-29 12:09:28 +02:00 committed by Antonio Borneo
parent 6a49b1ce23
commit bb81ec8bf0
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/target/startup.tcl
View File

@ -30,19 +30,18 @@ proc ocd_process_reset_inner { MODE } {
set targets [target names] set targets [target names]
# If this target must be halted... # If this target must be halted...
set halt -1 switch $MODE {
if { 0 == [string compare $MODE halt] } { halt -
init {
set halt 1 set halt 1
} }
if { 0 == [string compare $MODE init] } { run {
set halt 1; set halt 0
} }
if { 0 == [string compare $MODE run ] } { default {
set halt 0;
}
if { $halt < 0 } {
return -code error "Invalid mode: $MODE, must be one of: halt, init, or run"; return -code error "Invalid mode: $MODE, must be one of: halt, init, or run";
} }
}
# Target event handlers *might* change which TAPs are enabled # Target event handlers *might* change which TAPs are enabled
# or disabled, so we fire all of them. But don't issue any # or disabled, so we fire all of them. But don't issue any
@ -130,14 +129,14 @@ proc ocd_process_reset_inner { MODE } {
# Did we succeed? # Did we succeed?
set s [$t curstate] set s [$t curstate]
if { 0 != [string compare $s "halted" ] } { if { $s != "halted" } {
return -code error [format "TARGET: %s - Not halted" $t] return -code error [format "TARGET: %s - Not halted" $t]
} }
} }
} }
#Pass 2 - if needed "init" #Pass 2 - if needed "init"
if { 0 == [string compare init $MODE] } { if { $MODE == "init" } {
foreach t $targets { foreach t $targets {
if {[using_jtag] && ![jtag tapisenabled [$t cget -chain-position]]} { if {[using_jtag] && ![jtag tapisenabled [$t cget -chain-position]]} {
continue continue