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

[openocd.git] / tcl / chip / atmel / at91 / rtt.tcl

diff --git a/tcl/chip/atmel/at91/rtt.tcl b/tcl/chip/atmel/at91/rtt.tcl
index 433cfe30fda10a51b050d25d3a7ee985dbf4e455..3e3d414f4124c3784db62c17851a8f8ba193d0b6 100644 (file)
--- a/tcl/chip/atmel/at91/rtt.tcl
+++ b/tcl/chip/atmel/at91/rtt.tcl
@@ -1,15 +1,15 @@
 
-set RTTC_RTMR [expr $AT91C_BASE_RTTC + 0x00]
-set RTTC_RTAR [expr $AT91C_BASE_RTTC + 0x04]
-set RTTC_RTVR [expr $AT91C_BASE_RTTC + 0x08]
-set RTTC_RTSR [expr $AT91C_BASE_RTTC + 0x0c]
+set RTTC_RTMR [expr {$AT91C_BASE_RTTC + 0x00}]
+set RTTC_RTAR [expr {$AT91C_BASE_RTTC + 0x04}]
+set RTTC_RTVR [expr {$AT91C_BASE_RTTC + 0x08}]
+set RTTC_RTSR [expr {$AT91C_BASE_RTTC + 0x0c}]
 global RTTC_RTMR
 global RTTC_RTAR
 global RTTC_RTVR
 global RTTC_RTSR
 
 proc show_RTTC_RTMR_helper { NAME ADDR VAL } {
-    set rtpres [expr $VAL & 0x0ffff]
+    set rtpres [expr {$VAL & 0x0ffff}]
     global BIT16 BIT17
     if { $rtpres == 0 } {
        set rtpres 65536;
@@ -18,16 +18,16 @@ proc show_RTTC_RTMR_helper { NAME ADDR VAL } {
     # Nasty hack, make this a float by tacking a .0 on the end
     # otherwise, jim makes the value an integer
     set f [expr $AT91C_SLOWOSC_FREQ.0 / $rtpres.0]
-    puts [format "\tPrescale value: 0x%04x (%5d) => %f Hz" $rtpres $rtpres $f]
+    echo [format "\tPrescale value: 0x%04x (%5d) => %f Hz" $rtpres $rtpres $f]
     if { $VAL & $BIT16 } {
-       puts "\tBit16 -> Alarm IRQ Enabled"
+       echo "\tBit16 -> Alarm IRQ Enabled"
     } else {
-       puts "\tBit16 -> Alarm IRQ Disabled"
+       echo "\tBit16 -> Alarm IRQ Disabled"
     }
     if { $VAL & $BIT17 } {
-       puts "\tBit17 -> RTC Inc IRQ Enabled"
+       echo "\tBit17 -> RTC Inc IRQ Enabled"
     } else {
-       puts "\tBit17 -> RTC Inc IRQ Disabled"
+       echo "\tBit17 -> RTC Inc IRQ Disabled"
     }
     # Bit 18 is write only.
 }
@@ -35,14 +35,14 @@ proc show_RTTC_RTMR_helper { NAME ADDR VAL } {
 proc show_RTTC_RTSR_helper { NAME ADDR VAL } {
     global BIT0 BIT1
     if { $VAL & $BIT0 } {
-       puts "\tBit0 -> ALARM PENDING"
+       echo "\tBit0 -> ALARM PENDING"
     } else {
-       puts "\tBit0 -> alarm not pending"
+       echo "\tBit0 -> alarm not pending"
     }
     if { $VAL & $BIT1 } {
-       puts "\tBit0 -> RTINC PENDING"
+       echo "\tBit0 -> RTINC PENDING"
     } else {
-       puts "\tBit0 -> rtinc not pending"
+       echo "\tBit0 -> rtinc not pending"
     }
 }
 
@@ -53,4 +53,3 @@ proc show_RTTC { } {
     show_mmr32_reg RTTC_RTVR
     show_mmr32_reg RTTC_RTSR
 }
-