very slightly improved error message for not being able to find scripts

[openocd.git] / src / helper / startup.tcl

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 2f90911acd9ad3d52fd5c1fb6595987398712aa6..e60ad976f467b2fa1fee7f846a633c10cf2bcbe4 100644 (file)
--- 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
@@ -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 -code error "Can't find $filename"
 }
 add_help_text find "<file> - print full path to file according to OpenOCD search rules"
 
@@ -162,5 +151,13 @@ 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>"
 
+
+# Handle GDB 'R' packet. Can be overriden by configuration script,
+# but it's not something one would expect target scripts to do
+# normally
+proc ocd_gdb_restart {target_num} {
+       # Fix!!! we're resetting all targets here! Really we should reset only
+       # one target
+       reset halt
+}
\ No newline at end of file