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

6 files changed, 24 insertions, 24 deletions

diff --git a/src/flash/flash.c b/src/flash/flash.c
index dbf45919..8444bb33 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -181,7 +181,7 @@ int flash_init_drivers(struct command_context_s *cmd_ctx)
 {
 	if (flash_banks)
 	{
-		register_jim(cmd_ctx, "openocd_flash_banks", jim_flash_banks, "return information about the flash banks");
+		register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the flash banks");
 		
 		register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC,
 						 "print info about flash bank <num>");
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"
 
diff --git a/src/target/target.c b/src/target/target.c
index 0a528057..0f492ae1 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -955,8 +955,8 @@ int target_register_commands(struct command_context_s *cmd_ctx)
 
 
 	/* script procedures */
-	register_jim(cmd_ctx, "openocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing");
-	register_jim(cmd_ctx, "openocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values");
+	register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing");
+	register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values");
 	return ERROR_OK;
 }
 
diff --git a/src/tcl/chip/atmel/at91/aic.tcl b/src/tcl/chip/atmel/at91/aic.tcl
index 245224a5..1fe4514b 100644
--- a/src/tcl/chip/atmel/at91/aic.tcl
+++ b/src/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 { mem2array aaa 32 $AIC_SMR [expr 32 * 4] } msg ] {
+    if [catch { ocd_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 { mem2array aaa 32 $AIC_SVR [expr 32 * 4] } msg ] {
+    if [catch { ocd_mem2array aaa 32 $AIC_SVR [expr 32 * 4] } msg ] {
 	error [format "%s (%s)" $msg AIC_SVR]
     }
     puts "AIC_SVR: Vectors"
diff --git a/src/tcl/memory.tcl b/src/tcl/memory.tcl
index 42cd0627..219d39fa 100644
--- a/src/tcl/memory.tcl
+++ b/src/tcl/memory.tcl
@@ -80,7 +80,7 @@ proc address_info { ADDRESS } {
 
 proc memread32 {ADDR} {
     set foo(0) 0
-    if ![ catch { mem2array foo 32 $ADDR 1  } msg ] {
+    if ![ catch { ocd_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 { mem2array foo 16 $ADDR 1  } msg ] {
+    if ![ catch { ocd_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 { mem2array foo 8 $ADDR 1  } msg ] {
+    if ![ catch { ocd_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 { array2mem foo 32 $ADDR 1  } msg ] {
+    if ![ catch { ocd_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 { array2mem foo 16 $ADDR 1  } msg ] {
+    if ![ catch { ocd_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 { array2mem foo 8 $ADDR 1  } msg ] {
+    if ![ catch { ocd_array2mem foo 8 $ADDR 1  } msg ] {
 	return $foo(0)
     } else {
 	error "memwrite8: $msg"