tcl: [2/3] prepare for jimtcl 0.81 'expr' syntax change

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

diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg
index 5ef98e9e134b8b093a8597cb757c6fdd3b3e7834..15bacf308a962c9fbcb684bd688de59a18553792 100644 (file)
--- a/tcl/target/u8500.cfg
+++ b/tcl/target/u8500.cfg
@@ -52,9 +52,9 @@ proc pwrsts { } {
        irscan $_CHIPNAME.jrc 0x3a
        drscan $_CHIPNAME.jrc 4 0
        set pwrsts [drscan $_CHIPNAME.jrc 16 0]
-    echo "pwrsts ="$pwrsts
-    set a9 [expr (0x$pwrsts & 0xc)]
-       set ape [expr (0x$pwrsts & 0x3)]
+       echo "pwrsts ="$pwrsts
+       set a9 [expr "0x$pwrsts & 0xc"]
+       set ape [expr "0x$pwrsts & 0x3"]
        if {[string equal "0" $ape]} {
                echo "ape off"
        } else {
@@ -81,12 +81,12 @@ proc poll_pwrsts { } {
        irscan $_CHIPNAME.jrc 0x3a
        drscan $_CHIPNAME.jrc 4 0
        set pwrsts [drscan $_CHIPNAME.jrc 16 0]
-       set pwrsts [expr (0x$pwrsts & 0xc)]
+       set pwrsts [expr "0x$pwrsts & 0xc"]
        while {[string equal "4" $pwrsts] && $i<20} {
                irscan $_CHIPNAME.jrc 0x3a
                drscan $_CHIPNAME.jrc 4 0;
                set pwrsts [drscan $_CHIPNAME.jrc 16 0]
-               set pwrsts [expr (0x$pwrsts & 0xc)]
+               set pwrsts [expr "0x$pwrsts & 0xc"]
                if {![string equal "4" $pwrsts]} {
                        set result 1
                } else {
@@ -239,7 +239,7 @@ proc secsts1 { } {
                drscan $_CHIPNAME.jrc 4 4
        set secsts1 [drscan $_CHIPNAME.jrc 16 0]
        echo "secsts1 ="$secsts1
-       set secsts1 [expr (0x$secsts1 & 0x4)]
+       set secsts1 [expr "0x$secsts1 & 0x4"]
        if {![string equal "4" $secsts1]} {
        echo "APE target secured"
         } else {
@@ -254,7 +254,7 @@ proc att { } {
        drscan $_CHIPNAME.jrc 4 4
        set secsts1 [drscan $_CHIPNAME.jrc 16 0]
        echo "secsts1 ="$secsts1
-       set secsts1 [expr (0x$secsts1 & 0x4)]
+       set secsts1 [expr "0x$secsts1 & 0x4"]
        if {[string equal "4" $secsts1]} {
                if {[poll_pwrsts]==1} {
                enable_apetap
@@ -291,13 +291,13 @@ proc rst_run { } {
        drscan $_CHIPNAME.jrc 4 4
        set secsts1 [drscan $_CHIPNAME.jrc 16 0]
        echo "secsts1 ="$secsts1
-       set secsts1 [expr (0x$secsts1 & 0x4)]
+       set secsts1 [expr "0x$secsts1 & 0x4"]
        while {![string equal "4" $secsts1]} {
                irscan u8500.jrc 0x3a
                drscan u8500.jrc 4 4
                set secsts1 [drscan $_CHIPNAME.jrc 16 0]
                echo "secsts1 ="$secsts1
-               set secsts1 [expr (0x$secsts1 & 0x4)]
+               set secsts1 [expr "0x$secsts1 & 0x4"]
        }
        echo "ape debugable"
        enable_apetap