Remove all occurrences of 'mem2array' and 'array2mem'

[fw/openocd] / tcl / target / psoc4.cfg

diff --git a/tcl/target/psoc4.cfg b/tcl/target/psoc4.cfg
index cffcbc7538fa6763212593f68099541f9293e3cb..40f2fcab3a3f68f6cea61d44440ae434573a00a0 100644 (file)
--- a/tcl/target/psoc4.cfg
+++ b/tcl/target/psoc4.cfg
@@ -74,22 +74,22 @@ if {![using_hla]} {
 }
 
 proc psoc4_get_family_id {} {
-       set err [catch "mem2array romtable_pid 32 0xF0000FE0 3"]
+       set err [catch {set romtable_pid [read_memory 0xF0000FE0 32 3]}]
        if { $err } {
                return 0
        }
-       if { [expr {$romtable_pid(0) & 0xffffff00 }]
-         || [expr {$romtable_pid(1) & 0xffffff00 }]
-         || [expr {$romtable_pid(2) & 0xffffff00 }] } {
+       if { [expr {[lindex $romtable_pid 0] & 0xffffff00 }]
+         || [expr {[lindex $romtable_pid 1] & 0xffffff00 }]
+         || [expr {[lindex $romtable_pid 2] & 0xffffff00 }] } {
                echo "Unexpected data in ROMTABLE"
                return 0
        }
-       set designer_id [expr {(( $romtable_pid(1) & 0xf0 ) >> 4) | (( $romtable_pid(2) & 0xf ) << 4 ) }]
+       set designer_id [expr {(( [lindex $romtable_pid 1] & 0xf0 ) >> 4) | (( [lindex $romtable_pid 2] & 0xf ) << 4 ) }]
        if { $designer_id != 0xb4 } {
                echo [format "ROMTABLE Designer ID 0x%02x is not Cypress" $designer_id]
                return 0
        }
-       set family_id [expr {( $romtable_pid(0) & 0xff ) | (( $romtable_pid(1) & 0xf ) << 8 ) }]
+       set family_id [expr {( [lindex $romtable_pid 0] & 0xff ) | (( [lindex $romtable_pid 1] & 0xf ) << 8 ) }]
        return $family_id
 }
 
@@ -193,9 +193,9 @@ proc ocd_process_reset_inner { MODE } {
                }
 
                # Set registers to reset vector values
-               mem2array value 32 0 2
-               reg pc [expr {$value(1) & 0xfffffffe} ]
-               reg msp $value(0)
+               set value [read_memory 0x0 32 2]
+               reg pc [expr {[lindex $value 1] & 0xfffffffe}]
+               reg msp [lindex $value 0]
 
                if { $PSOC4_TEST_MODE_WORKAROUND } {
                        catch { mww $TEST_MODE 0 }