diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-20 17:04:58 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-20 17:04:58 +0000 |
commit | 6c0553c8c504d4c6da20857abeec80648d841b72 (patch) | |
tree | ef5a8e4e4d925f27a354bf870aa9a9a2c4b7bf21 /src/helper | |
parent | 42501f0ef0beb573fcbe904320b9a0fba02dcc3b (diff) |
openocd@duaneellis.com fix naming confusion. Use ocd_ prefix for ocd API consistently.
git-svn-id: svn://svn.berlios.de/openocd/trunk@839 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r-- | src/helper/command.c | 4 | ||||
-rw-r--r-- | src/helper/startup.tcl | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/helper/command.c b/src/helper/command.c index 04737001..12827ecd 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -99,7 +99,7 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv) log_remove_callback(tcl_output, tclOutput); /* We dump output into this local variable */ - Jim_SetVariableStr(interp, "openocd_output", tclOutput); + Jim_SetVariableStr(interp, "ocd_output", tclOutput); } for (i = 0; i < nwords; i++) @@ -623,7 +623,7 @@ command_context_t* command_init() Jim_RegisterCoreCommands(interp); #endif - Jim_CreateCommand(interp, "openocd_find", jim_find, NULL, NULL); + Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL); Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL); /* Set Jim's STDIO */ diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index 2f90911a..4e12e30b 100644 --- a/src/helper/startup.tcl +++ b/src/helper/startup.tcl @@ -40,7 +40,7 @@ proc board_test {} { proc flash_banks {} { set i 0 set result "" - foreach {a} [openocd_flash_banks] { + foreach {a} [ocd_flash_banks] { if {$i > 0} { set result "$result\n" } @@ -53,7 +53,7 @@ proc flash_banks {} { # We need to explicitly redirect this to the OpenOCD command # as Tcl defines the exit proc proc exit {} { - openocd_throw exit + ocd_throw exit } #Print help text for a command. Word wrap @@ -94,17 +94,17 @@ add_help_text help "Tcl implementation of help command" #a bit of backwards compatibility -proc openocd_throw {cmd} { - set openocd_output "" +proc ocd_throw {cmd} { + set ocd_output "" eval $cmd - return $openocd_output + return $ocd_output } #a bit of backwards compatibility proc openocd {cmd} { - set openocd_output "" + set ocd_output "" eval $cmd - return $openocd_output + return $ocd_output } # If a fn is unknown to Tcl, we try to execute it as an OpenOCD command @@ -137,17 +137,17 @@ proc target_script {target_num eventname scriptname} { # Try flipping / and \ to find file if the filename does not # match the precise spelling proc find {filename} { - if {[catch {openocd_find $filename} t]==0} { + if {[catch {ocd_find $filename} t]==0} { return $t } - if {[catch {openocd_find [string map {\ /} $filename} t]==0} { + if {[catch {ocd_find [string map {\ /} $filename} t]==0} { return $t } - if {[catch {openocd_find [string map {/ \\} $filename} t]==0} { + if {[catch {ocd_find [string map {/ \\} $filename} t]==0} { return $t } # make sure error message matches original input string - return [openocd_find $filename] + return [ocd_find $filename] } add_help_text find "<file> - print full path to file according to OpenOCD search rules" |