diff options
Diffstat (limited to 'tcl')
| -rw-r--r-- | tcl/board/at91cap7a-stk-sdram.cfg | 2 | ||||
| -rw-r--r-- | tcl/board/at91sam9g20-ek.cfg | 2 | ||||
| -rw-r--r-- | tcl/chip/atmel/at91/aic.tcl | 4 | ||||
| -rw-r--r-- | tcl/memory.tcl | 12 | ||||
| -rw-r--r-- | tcl/target/c100helper.tcl | 8 | ||||
| -rw-r--r-- | tcl/target/davinci.cfg | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/tcl/board/at91cap7a-stk-sdram.cfg b/tcl/board/at91cap7a-stk-sdram.cfg index 6a7e22b2..cca12119 100644 --- a/tcl/board/at91cap7a-stk-sdram.cfg +++ b/tcl/board/at91cap7a-stk-sdram.cfg @@ -32,7 +32,7 @@ $_TARGETNAME configure -event reset-start { } proc peek32 {address} { - ocd_mem2array t 32 $address 1 + mem2array t 32 $address 1 return $t(0) } diff --git a/tcl/board/at91sam9g20-ek.cfg b/tcl/board/at91sam9g20-ek.cfg index b50e8c86..15a9caf2 100644 --- a/tcl/board/at91sam9g20-ek.cfg +++ b/tcl/board/at91sam9g20-ek.cfg @@ -67,7 +67,7 @@ at91sam9 ce 0 0xfffff800 14 proc read_register {register} { set result "" - ocd_mem2array result 32 $register 1 + mem2array result 32 $register 1 return $result(0) } diff --git a/tcl/chip/atmel/at91/aic.tcl b/tcl/chip/atmel/at91/aic.tcl index 8c276aa5..366be6d0 100644 --- a/tcl/chip/atmel/at91/aic.tcl +++ b/tcl/chip/atmel/at91/aic.tcl @@ -54,7 +54,7 @@ proc show_AIC_IMR_helper { NAME ADDR VAL } { proc show_AIC { } { global AIC_SMR - if [catch { ocd_mem2array aaa 32 $AIC_SMR [expr 32 * 4] } msg ] { + if [catch { mem2array aaa 32 $AIC_SMR [expr 32 * 4] } msg ] { error [format "%s (%s)" $msg AIC_SMR] } puts "AIC_SMR: Mode & Type" @@ -71,7 +71,7 @@ proc show_AIC { } { incr x } global AIC_SVR - if [catch { ocd_mem2array aaa 32 $AIC_SVR [expr 32 * 4] } msg ] { + if [catch { mem2array aaa 32 $AIC_SVR [expr 32 * 4] } msg ] { error [format "%s (%s)" $msg AIC_SVR] } puts "AIC_SVR: Vectors" diff --git a/tcl/memory.tcl b/tcl/memory.tcl index c4418fa1..2719d3fe 100644 --- a/tcl/memory.tcl +++ b/tcl/memory.tcl @@ -80,7 +80,7 @@ proc address_info { ADDRESS } { proc memread32 {ADDR} { set foo(0) 0 - if ![ catch { ocd_mem2array foo 32 $ADDR 1 } msg ] { + if ![ catch { mem2array foo 32 $ADDR 1 } msg ] { return $foo(0) } else { error "memread32: $msg" @@ -89,7 +89,7 @@ proc memread32 {ADDR} { proc memread16 {ADDR} { set foo(0) 0 - if ![ catch { ocd_mem2array foo 16 $ADDR 1 } msg ] { + if ![ catch { mem2array foo 16 $ADDR 1 } msg ] { return $foo(0) } else { error "memread16: $msg" @@ -98,7 +98,7 @@ proc memread16 {ADDR} { proc memread8 {ADDR} { set foo(0) 0 - if ![ catch { ocd_mem2array foo 8 $ADDR 1 } msg ] { + if ![ catch { mem2array foo 8 $ADDR 1 } msg ] { return $foo(0) } else { error "memread8: $msg" @@ -107,7 +107,7 @@ proc memread8 {ADDR} { proc memwrite32 {ADDR DATA} { set foo(0) $DATA - if ![ catch { ocd_array2mem foo 32 $ADDR 1 } msg ] { + if ![ catch { array2mem foo 32 $ADDR 1 } msg ] { return $foo(0) } else { error "memwrite32: $msg" @@ -116,7 +116,7 @@ proc memwrite32 {ADDR DATA} { proc memwrite16 {ADDR DATA} { set foo(0) $DATA - if ![ catch { ocd_array2mem foo 16 $ADDR 1 } msg ] { + if ![ catch { array2mem foo 16 $ADDR 1 } msg ] { return $foo(0) } else { error "memwrite16: $msg" @@ -125,7 +125,7 @@ proc memwrite16 {ADDR DATA} { proc memwrite8 {ADDR DATA} { set foo(0) $DATA - if ![ catch { ocd_array2mem foo 8 $ADDR 1 } msg ] { + if ![ catch { array2mem foo 8 $ADDR 1 } msg ] { return $foo(0) } else { error "memwrite8: $msg" diff --git a/tcl/target/c100helper.tcl b/tcl/target/c100helper.tcl index 2a12c362..45adc62c 100644 --- a/tcl/target/c100helper.tcl +++ b/tcl/target/c100helper.tcl @@ -29,14 +29,14 @@ proc helpC100 {} { # mrw: "memory read word", returns value of $reg proc mrw {reg} { set value "" - ocd_mem2array value 32 $reg 1 + mem2array value 32 $reg 1 return $value(0) } # read a 64-bit register (memory mapped) proc mr64bit {reg} { set value "" - ocd_mem2array value 32 $reg 2 + mem2array value 32 $reg 2 return $value } @@ -131,7 +131,7 @@ proc showAmbaClk {} { set PLL_CLK_BYPASS [regs PLL_CLK_BYPASS] puts [format "CLKCORE_AHB_CLK_CNTRL (0x%x): 0x%x" $CLKCORE_AHB_CLK_CNTRL [mrw $CLKCORE_AHB_CLK_CNTRL]] - ocd_mem2array value 32 $CLKCORE_AHB_CLK_CNTRL 1 + mem2array value 32 $CLKCORE_AHB_CLK_CNTRL 1 # see if the PLL is in bypass mode set bypass [expr ($value(0) & $PLL_CLK_BYPASS) >> 24 ] puts [format "PLL bypass bit: %d" $bypass] @@ -206,7 +206,7 @@ proc showArmClk {} { set PLL_CLK_BYPASS [regs PLL_CLK_BYPASS] puts [format "CLKCORE_ARM_CLK_CNTRL (0x%x): 0x%x" $CLKCORE_ARM_CLK_CNTRL [mrw $CLKCORE_ARM_CLK_CNTRL]] - ocd_mem2array value 32 $CLKCORE_ARM_CLK_CNTRL 1 + mem2array value 32 $CLKCORE_ARM_CLK_CNTRL 1 # see if the PLL is in bypass mode set bypass [expr ($value(0) & $PLL_CLK_BYPASS) >> 24 ] puts [format "PLL bypass bit: %d" $bypass] diff --git a/tcl/target/davinci.cfg b/tcl/target/davinci.cfg index 31750dd5..6c6769fa 100644 --- a/tcl/target/davinci.cfg +++ b/tcl/target/davinci.cfg @@ -10,7 +10,7 @@ proc davinci_pinmux {soc reg value} { # mrw: "memory read word", returns value of $reg proc mrw {reg} { set value "" - ocd_mem2array value 32 $reg 1 + mem2array value 32 $reg 1 return $value(0) } |