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

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

diff --git a/tcl/target/davinci.cfg b/tcl/target/davinci.cfg
index ef07856d218c178eb8dc6c69ebf740c6a472dfd5..d2ed5928b7f0f46cf254234f5d8ee4617a2498e4 100644 (file)
--- a/tcl/target/davinci.cfg
+++ b/tcl/target/davinci.cfg
@@ -4,7 +4,7 @@
 
 # davinci_pinmux: assigns PINMUX$reg <== $value
 proc davinci_pinmux {soc reg value} {
-       mww [expr [dict get $soc sysbase] + 4 * $reg] $value
+       mww [expr {[dict get $soc sysbase] + 4 * $reg}] $value
 }
 
 source [find mem_helper.tcl]
@@ -110,7 +110,7 @@ proc pll_v02_setup {pll_addr mult config} {
                # write pllcmd.GO; poll pllstat.GO
                mww [expr {$pll_addr + 0x0138}] 0x01
                set pllstat [expr {$pll_addr + 0x013c}]
-               while {[expr [mrw $pllstat] & 0x01] != 0} { sleep 1 }
+               while {[expr {[mrw $pllstat] & 0x01}] != 0} { sleep 1 }
        }
        mww [expr {$pll_addr + 0x0138}] 0x00
 
@@ -272,11 +272,11 @@ proc pll_v03_setup {pll_addr mult config} {
                # write pllcmd.GO; poll pllstat.GO
                mww [expr {$pll_addr + 0x0138}] 0x01
                set pllstat [expr {$pll_addr + 0x013c}]
-               while {[expr [mrw $pllstat] & 0x01] != 0} { sleep 1 }
+               while {[expr {[mrw $pllstat] & 0x01}] != 0} { sleep 1 }
        }
        mww [expr {$pll_addr + 0x0138}] 0x00
        set addr [dict get $config ctladdr]
-       while {[expr [mrw $addr] & 0x0e000000] != 0x0e000000} { sleep 1 }
+       while {[expr {[mrw $addr] & 0x0e000000}] != 0x0e000000} { sleep 1 }
 
        # 12 - set PLLEN (bit 0) ... leave bypass mode
        set pll_ctrl [expr {$pll_ctrl | 0x0001}]
@@ -306,13 +306,13 @@ proc psc_go {} {
        set ptstat_addr [expr {$psc_addr + 0x0128}]
 
        # just in case PTSTAT.go isn't clear
-       while { [expr [mrw $ptstat_addr] & 0x01] != 0 } { sleep 1 }
+       while { [expr {[mrw $ptstat_addr] & 0x01}] != 0 } { sleep 1 }
 
        # write PTCMD.go ... ignoring any DSP power domain
        mww [expr {$psc_addr + 0x0120}] 1
 
        # wait for PTSTAT.go to clear (again ignoring DSP power domain)
-       while { [expr [mrw $ptstat_addr] & 0x01] != 0 } { sleep 1 }
+       while { [expr {[mrw $ptstat_addr] & 0x01}] != 0 } { sleep 1 }
 }
 
 #