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

[fw/openocd] / tcl / chip / atmel / at91 / at91_wdt.cfg

diff --git a/tcl/chip/atmel/at91/at91_wdt.cfg b/tcl/chip/atmel/at91/at91_wdt.cfg
index a263cc7f6ba15561c84d150fc36ac684ae145704..9b4e817e29a6b25e493267140fc3e86fe0d9e91b 100644 (file)
--- a/tcl/chip/atmel/at91/at91_wdt.cfg
+++ b/tcl/chip/atmel/at91/at91_wdt.cfg
@@ -1,17 +1,17 @@
-set AT91_WDT_CR                [expr ($AT91_WDT + 0x00)]       ;# Watchdog Control Register
-set            AT91_WDT_WDRSTT         [expr (1    << 0)]      ;# Restart
-set            AT91_WDT_KEY            [expr (0xa5 << 24)]     ;# KEY Password
+set AT91_WDT_CR                [expr {$AT91_WDT + 0x00}]       ;# Watchdog Control Register
+set            AT91_WDT_WDRSTT         [expr {1    << 0}]      ;# Restart
+set            AT91_WDT_KEY            [expr {0xa5 << 24}]     ;# KEY Password
 
-set AT91_WDT_MR                [expr ($AT91_WDT + 0x04)]       ;# Watchdog Mode Register
-set            AT91_WDT_WDV            [expr (0xfff << 0)]     ;# Counter Value
-set            AT91_WDT_WDFIEN         [expr (1     << 12)]    ;# Fault Interrupt Enable
-set            AT91_WDT_WDRSTEN        [expr (1     << 13)]    ;# Reset Processor
-set            AT91_WDT_WDRPROC        [expr (1     << 14)]    ;# Timer Restart
-set            AT91_WDT_WDDIS          [expr (1     << 15)]    ;# Watchdog Disable
-set            AT91_WDT_WDD            [expr (0xfff << 16)]    ;# Delta Value
-set            AT91_WDT_WDDBGHLT       [expr (1     << 28)]    ;# Debug Halt
-set            AT91_WDT_WDIDLEHLT      [expr (1     << 29)]    ;# Idle Halt
+set AT91_WDT_MR                [expr {$AT91_WDT + 0x04}]       ;# Watchdog Mode Register
+set            AT91_WDT_WDV            [expr {0xfff << 0}]     ;# Counter Value
+set            AT91_WDT_WDFIEN         [expr {1     << 12}]    ;# Fault Interrupt Enable
+set            AT91_WDT_WDRSTEN        [expr {1     << 13}]    ;# Reset Processor
+set            AT91_WDT_WDRPROC        [expr {1     << 14}]    ;# Timer Restart
+set            AT91_WDT_WDDIS          [expr {1     << 15}]    ;# Watchdog Disable
+set            AT91_WDT_WDD            [expr {0xfff << 16}]    ;# Delta Value
+set            AT91_WDT_WDDBGHLT       [expr {1     << 28}]    ;# Debug Halt
+set            AT91_WDT_WDIDLEHLT      [expr {1     << 29}]    ;# Idle Halt
 
-set AT91_WDT_SR                [expr ($AT91_WDT + 0x08)]       ;# Watchdog Status Register
-set            AT91_WDT_WDUNF          [expr (1 << 0)]         ;# Watchdog Underflow
-set            AT91_WDT_WDERR          [expr (1 << 1)]         ;# Watchdog Error
+set AT91_WDT_SR                [expr {$AT91_WDT + 0x08}]       ;# Watchdog Status Register
+set            AT91_WDT_WDUNF          [expr {1 << 0}]         ;# Watchdog Underflow
+set            AT91_WDT_WDERR          [expr {1 << 1}]         ;# Watchdog Error