X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fstartup.tcl;h=d3ddb30c06179fa137370668bf882e5661c66542;hp=6e5f577d7d83e4203b48b2e20914cfc106536b18;hb=dfbb9f3e89ae;hpb=2cac9c333fae5a5c944e2cd05544d17ba3db1251

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 6e5f577d7d..d3ddb30c06 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
@@ -93,20 +93,6 @@ proc help {args} {
 add_help_text help "Tcl implementation of help command"
 
 
-#a bit of backwards compatibility
-proc openocd_throw {cmd} {
-	set openocd_output ""
-	eval $cmd
-	return $openocd_output
-}
-
-#a bit of backwards compatibility
-proc openocd {cmd} {
-	set openocd_output ""
-	eval $cmd
-	return $openocd_output
-}
-
 # If a fn is unknown to Tcl, we try to execute it as an OpenOCD command
 #
 # We also support two level commands. "flash banks" is translated to
@@ -120,7 +106,7 @@ proc unknown {args} {
 		return [eval "$cmd_name [lrange $args 2 end]"]
 	}
 	# This really is an unknown command.
-	puts "Unknown command: $args"
+	return -code error "Unknown command: $args"
 }
 
 
@@ -130,24 +116,27 @@ proc target_script {target_num eventname scriptname} {
 	}
 
 	# This is the script we invoke
-	proc "target_[set eventname]_[set target_num]" {} "script $scriptname" 
+	proc "target_[set target_num]_[set eventname]" {} "script $scriptname" 
 	
 }
 
+add_help_text target_script "<target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"
+
+
 # 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"
 
@@ -162,5 +151,4 @@ proc script {filename} {
 
 add_help_text script "<filename> - filename of OpenOCD script (tcl) to run"
 
-add_help_text target_script "<target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"