X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fstartup.tcl;h=290e79d1eee3ab13a1f193f887114c813b313dd1;hb=3cd7c40c3c7c7cc82824b41f5e2be8ff118ce41f;hp=cee036697459b387ab6058befa04a13b532587e6;hpb=223b79ebe21d53a21c85289349232fe7b8dca564;p=fw%2Fopenocd

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index cee036697..290e79d1e 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -1,7 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 # Defines basic Tcl procs for OpenOCD target module
 
 proc new_target_name { } {
-	return [target number [expr [target count] - 1 ]]
+	return [target number [expr {[target count] - 1}]]
 }
 
 global in_process_reset
@@ -16,7 +18,7 @@ proc ocd_process_reset { MODE } {
 	}
 
 	set in_process_reset 1
-	set success [expr [catch {ocd_process_reset_inner $MODE} result]==0]
+	set success [expr {[catch {ocd_process_reset_inner $MODE} result] == 0}]
 	set in_process_reset 0
 
 	if {$success} {
@@ -30,18 +32,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 +131,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
@@ -207,6 +208,32 @@ proc init_target_events {} {
 proc init_board {} {
 }
 
+proc mem2array {arrayname bitwidth address count {phys ""}} {
+	echo "DEPRECATED! use 'read_memory' not 'mem2array'"
+
+	upvar $arrayname $arrayname
+	set $arrayname ""
+	set i 0
+
+	foreach elem [read_memory $address $bitwidth $count {*}$phys] {
+		set ${arrayname}($i) $elem
+		incr i
+	}
+}
+
+proc array2mem {arrayname bitwidth address count {phys ""}} {
+	echo "DEPRECATED! use 'write_memory' not 'array2mem'"
+
+	upvar $arrayname $arrayname
+	set data ""
+
+	for {set i 0} {$i < $count} {incr i} {
+		lappend data [expr $${arrayname}($i)]
+	}
+
+	write_memory $address $bitwidth $data {*}$phys
+}
+
 # smp_on/smp_off were already DEPRECATED in v0.11.0 through http://openocd.zylin.com/4615
 lappend _telnet_autocomplete_skip "aarch64 smp_on"
 proc "aarch64 smp_on" {args} {