From 8f779cf66bf459616b7dad88e871c2f4a7315371 Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Wed, 11 Aug 2010 17:24:55 +0200 Subject: tcl: remove silly ocd_ prefix to array2mem and mem2array MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocd_ prefix is used internally in OpenOCD as a kludge more or less to deal with the two kinds of commands that OpenOCD has. Signed-off-by: Øyvind Harboe --- tcl/target/c100helper.tcl | 8 ++++---- tcl/target/davinci.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tcl/target') 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) } -- cgit v1.2.3