jtag/cmsis_dap: switch to command 'adapter serial'

[fw/openocd] / tcl / fpga / xilinx-xadc.cfg

diff --git a/tcl/fpga/xilinx-xadc.cfg b/tcl/fpga/xilinx-xadc.cfg
index 043e55393939b7517b8708c0e5074c711183b566..250879ec93bf7399bc340a4f2d7f6d7860699902 100644 (file)
--- a/tcl/fpga/xilinx-xadc.cfg
+++ b/tcl/fpga/xilinx-xadc.cfg
@@ -16,7 +16,7 @@ proc xadc_cmd {cmd addr data} {
                READ 0x01
                WRITE 0x02
        }
-       return [expr ($cmds($cmd) << 26) | ($addr << 16) | ($data << 0)]
+       return [expr {($cmds($cmd) << 26) | ($addr << 16) | ($data << 0)}]
 }
 
 # XADC register addresses
@@ -101,7 +101,7 @@ proc xadc_select {tap} {
 proc xadc_xfer {tap cmd addr data} {
        set ret [drscan $tap 32 [xadc_cmd $cmd $addr $data]]
        runtest 10
-       return [expr 0x$ret]
+       return [expr "0x$ret"]
 }
 
 # XADC register write