X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=tcl%2Fchip%2Fatmel%2Fat91%2Fusarts.tcl;h=62a651bbdc4f87c20930ddc5da5624a43717ce11;hb=573a39b36cf133bb7403b12337301a5616112f1a;hp=19f4ed4cff2cfa88730279145d286a3389d97953;hpb=dbbc9c41f7db210b0a4e226540a28e0a8a5019bf;p=openocd.git

diff --git a/tcl/chip/atmel/at91/usarts.tcl b/tcl/chip/atmel/at91/usarts.tcl
index 19f4ed4cff..62a651bbdc 100644
--- a/tcl/chip/atmel/at91/usarts.tcl
+++ b/tcl/chip/atmel/at91/usarts.tcl
@@ -1,20 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 # the DBGU and USARTs are 'almost' indentical'
-set DBGU_CR         [expr $AT91C_BASE_DBGU + 0x00000000]
-set DBGU_MR         [expr $AT91C_BASE_DBGU + 0x00000004]
-set DBGU_IER        [expr $AT91C_BASE_DBGU + 0x00000008]
-set DBGU_IDR        [expr $AT91C_BASE_DBGU + 0x0000000C]
-set DBGU_IMR        [expr $AT91C_BASE_DBGU + 0x00000010]
-set DBGU_CSR        [expr $AT91C_BASE_DBGU + 0x00000014]
-set DBGU_RHR        [expr $AT91C_BASE_DBGU + 0x00000018]
-set DBGU_THR        [expr $AT91C_BASE_DBGU + 0x0000001C]
-set DBGU_BRGR       [expr $AT91C_BASE_DBGU + 0x00000020]
+set DBGU_CR         [expr {$AT91C_BASE_DBGU + 0x00000000}]
+set DBGU_MR         [expr {$AT91C_BASE_DBGU + 0x00000004}]
+set DBGU_IER        [expr {$AT91C_BASE_DBGU + 0x00000008}]
+set DBGU_IDR        [expr {$AT91C_BASE_DBGU + 0x0000000C}]
+set DBGU_IMR        [expr {$AT91C_BASE_DBGU + 0x00000010}]
+set DBGU_CSR        [expr {$AT91C_BASE_DBGU + 0x00000014}]
+set DBGU_RHR        [expr {$AT91C_BASE_DBGU + 0x00000018}]
+set DBGU_THR        [expr {$AT91C_BASE_DBGU + 0x0000001C}]
+set DBGU_BRGR       [expr {$AT91C_BASE_DBGU + 0x00000020}]
 # no RTOR
 # no TTGR
 # no FIDI
 # no NER
-set DBGU_CIDR       [expr $AT91C_BASE_DBGU + 0x00000040]
-set DBGU_EXID       [expr $AT91C_BASE_DBGU + 0x00000044]
-set DBGU_FNTR       [expr $AT91C_BASE_DBGU + 0x00000048]
+set DBGU_CIDR       [expr {$AT91C_BASE_DBGU + 0x00000040}]
+set DBGU_EXID       [expr {$AT91C_BASE_DBGU + 0x00000044}]
+set DBGU_FNTR       [expr {$AT91C_BASE_DBGU + 0x00000048}]
 
 
 set USx_CR           0x00000000
@@ -41,37 +43,37 @@ proc show_mmr_USx_MR_helper { NAME ADDR VAL } {
 
     set x [show_normalize_bitfield $VAL 3 0]
     if { $x == 0 } {
-	puts "\tNormal operation"
+	echo "\tNormal operation"
     } else {
-	puts [format "\tNon Normal operation mode: 0x%02x" $x]
+	echo [format "\tNon Normal operation mode: 0x%02x" $x]
     }
 
     set x [show_normalize_bitfield $VAL 11 9]
     set s "unknown"
-    switch -exact $x { 
+    switch -exact $x {
 	0 { set s "Even" }
 	1 { set s "Odd" }
 	2 { set s "Force=0" }
 	3 { set s "Force=1" }
 	* {
-	    set $x [expr $x & 6]
+	    set $x [expr {$x & 6}]
 	    switch -exact $x {
 		4 { set s "None" }
 		6 { set s "Multidrop Mode" }
 	    }
 	}
     }
-    puts [format "\tParity: %s " $s]
-    
-    set x [expr 5 + [show_normalize_bitfield $VAL 7 6]]
-    puts [format "\tDatabits: %d" $x]
+    echo [format "\tParity: %s " $s]
+
+    set x [expr {5 + [show_normalize_bitfield $VAL 7 6]}]
+    echo [format "\tDatabits: %d" $x]
 
     set x [show_normalize_bitfield $VAL 13 12]
     switch -exact $x {
-	0 { puts "\tStop bits: 1" }
-	1 { puts "\tStop bits: 1.5" }
-	2 { puts "\tStop bits: 2" }
-	3 { puts "\tStop bits: Illegal/Reserved" }
+	0 { echo "\tStop bits: 1" }
+	1 { echo "\tStop bits: 1.5" }
+	2 { echo "\tStop bits: 2" }
+	3 { echo "\tStop bits: Illegal/Reserved" }
     }
 }
 
@@ -80,7 +82,7 @@ foreach WHO { US0 US1 US2 US3 US4 US5 US6 US7 US8 US9 } {
     set n AT91C_BASE_[set WHO]
     set str ""
 
-    # Only if it exists on the chip 
+    # Only if it exists on the chip
     if [ info exists $n ] {
 	# Hence: $n - is like AT91C_BASE_USx
 	# For every sub-register
@@ -89,7 +91,7 @@ foreach WHO { US0 US1 US2 US3 US4 US5 US6 US7 US8 US9 } {
 	    set vn [set WHO]_[set REG]
 	    # vn = USx_IER
 	    # vv = variable value
-	    set vv [expr $$n + [set USx_[set REG]]]
+	    set vv [expr "$$n + [set USx_[set REG]]"]
 	    # And VV is the address in memory of that register
 
 
@@ -114,12 +116,12 @@ set str ""
 
 
 # For every sub-register
-foreach REG {DBGU_CR DBGU_MR DBGU_IER DBGU_IDR DBGU_IMR 
+foreach REG {DBGU_CR DBGU_MR DBGU_IER DBGU_IDR DBGU_IMR
     DBGU_CSR DBGU_RHR DBGU_THR DBGU_BRGR DBGU_CIDR DBGU_EXID DBGU_FNTR} {
 
     # Create a command for this specific register.
     proc show_$REG { } "show_mmr32_reg $REG"
-    
+
     # Add this command to the Device(as a whole) command
     set str "$str\nshow_$REG"
 }
@@ -130,6 +132,3 @@ proc show_DBGU { } $str
 unset str
 
 proc show_DBGU_MR_helper { NAME ADDR VAL } { show_mmr_USx_MR_helper $NAME $ADDR $VAL }
-
-
-