Replace mem2array with read_memory.

The function "mem2array" is deprecated. Replace it with "read_memory", which has a slightly different footprint.
muhkuh-sys · Oct 27, 2023 · 95e8821 · 95e8821
1 parent c736a31
commit 95e8821
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/plugins/romloader/jtag/openocd/tcl/chip_init.tcl b/plugins/romloader/jtag/openocd/tcl/chip_init.tcl
@@ -244,9 +244,7 @@ proc init_chip {iChiptyp} {
 
 		puts "Configuring pad ctrl for MMIO4-7 (input, disable pull-down)"
 		proc read_data32 {addr} {
-			set value(0) 0
-			mem2array value 32 $addr 1
-			return $value(0)
+			return [read_memory $addr 32 1]
 		}
 
 		proc unlock_asic_ctrl {} {
@@ -296,9 +294,7 @@ proc init_chip {iChiptyp} {
 		puts "Init netIOL (preliminary)"
 
 		proc read_data32 {addr} {
-			set value(0) 0
-			mem2array value 32 $addr 1
-			return $value(0)
+			return [read_memory $addr 32 1]
 		}
 
 		# Initialize the PLL.

diff --git a/plugins/romloader/jtag/openocd/tcl/jtag_detect_init.tcl b/plugins/romloader/jtag/openocd/tcl/jtag_detect_init.tcl
@@ -510,9 +510,7 @@ proc probe_cpu {strCpu} {
 # ###################################################################
 
 proc mread32 {addr} {
-  set value(0) 0
-  mem2array value 32 $addr 1
-  return $value(0)
+  return [read_memory $addr 32 1]
 }
 
 # todo: pass target name from plugin