Jonas Horberg [jhorberg@sauer-danfoss.com]

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 75940e914c1aadefa31188d529861f58a487e121..14b209205a5162b527f13cba8ac63abed60671a4 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -88,9 +88,10 @@ proc unknown {args} {
        # do the name mangling from "flash banks" to "flash_banks"
        if {[llength $args]>=2} {
                set cmd_name "[lindex $args 0]_[lindex $args 1]"
-               # Fix?? add a check here if this is a command?
-               # we'll strip away args until we fail anyway...
-               return [eval "$cmd_name [lrange $args 2 end]"]
+               if {[catch {info body $cmd_name}]==0} {
+                   # the command exists, try it...
+                       return [eval "$cmd_name [lrange $args 2 end]"]
+               }
        }
        # This really is an unknown command.
        return -code error "Unknown command: $args"
@@ -100,37 +101,6 @@ proc new_target_name { } {
        return [target number [expr [target count] - 1 ]]
 }
 
-
-proc target_script {target_num eventname scriptname} {
-
-       set tname [target number $target_num]
-       
-       if { 0 == [string compare $eventname "reset"] } {
-               $tname configure -event reset-init "script $scriptname"
-               return
-       }
-
-       if { 0 == [string compare $eventname "post_reset"] } {
-               $tname configure -event reset-init "script $scriptname"
-               return
-       }
-
-       if { 0 == [string compare $eventname "pre_reset"] } {
-               $tname configure -event reset-start "script $scriptname"
-               return
-       }
-
-       if { 0 == [string compare $eventname "gdb_program_config"] } {
-               $tname configure -event old-gdb_program_config "script $scriptname"
-               return
-       }
-
-       return -code error "Unknown target (old) event: $eventname (try $tname configure -event NAME)"
-
-}
-
-add_help_text target_script "DEPRECATED please see the new TARGETNAME configure -event interface"
-
 # Try flipping / and \ to find file if the filename does not
 # match the precise spelling
 proc find {filename} {
@@ -153,10 +123,6 @@ proc script {filename} {
        source [find $filename]
 }
 
-#proc daemon_reset {} {
-#      puts "Daemon reset is obsolete. Use -c init -c \"reset halt\" at end of openocd command line instead");
-#}
-
 add_help_text script "<filename> - filename of OpenOCD script (tcl) to run"
 
 # Handle GDB 'R' packet. Can be overriden by configuration script,
@@ -168,15 +134,6 @@ proc ocd_gdb_restart {target_num} {
        reset halt
 }
 
-# If RCLK is not supported, use fallback_speed_khz
-proc jtag_rclk {fallback_speed_khz} {
-       if {[catch {jtag_khz 0}]!=0} {
-               jtag_khz $fallback_speed_khz
-       }
-}
-
-add_help_text jtag_rclk "fallback_speed_khz - set JTAG speed to RCLK or use fallback speed"
-
 proc ocd_process_reset { MODE } {
 
        # If this target must be halted...
@@ -194,6 +151,11 @@ proc ocd_process_reset { MODE } {
                return -error "Invalid mode: $MODE, must be one of: halt, init, or run";
        }
 
+       # Target event handlers *might* change which TAPs are enabled
+       # or disabled, so we fire all of them.  But don't issue any
+       # of the "arp_*" commands, which may issue JTAG transactions,
+       # unless we know the underlying TAP is active.
+
        foreach t [ target names ] {
                # New event script.
                $t invoke-event reset-start
@@ -202,16 +164,20 @@ proc ocd_process_reset { MODE } {
        # Init the tap controller.
        jtag arp_init-reset
 
-       # Examine all targets.
+       # Examine all targets on enabled taps.
        foreach t [ target names ] {
-               $t arp_examine
+               if {[jtag tapisenabled [$t cget -chain-position]]} {
+                       $t arp_examine
+               }
        }
 
        # Let the C code know we are asserting reset.
        foreach t [ target names ] {
                $t invoke-event reset-assert-pre
                # C code needs to know if we expect to 'halt'
-               $t arp_reset assert $halt
+               if {[jtag tapisenabled [$t cget -chain-position]]} {
+                       $t arp_reset assert $halt
+               }
                $t invoke-event reset-assert-post
        }
 
@@ -219,14 +185,19 @@ proc ocd_process_reset { MODE } {
        foreach t [ target names ] {
                $t invoke-event reset-deassert-pre
                # Again, de-assert code needs to know..
-               $t arp_reset deassert $halt
+               if {[jtag tapisenabled [$t cget -chain-position]]} {
+                       $t arp_reset deassert $halt
+               }
                $t invoke-event reset-deassert-post
        }
 
        # Pass 1 - Now try to halt.
        if { $halt } {
                foreach t [target names] {
-       
+                       if {[jtag tapisenabled [$t cget -chain-position]] == 0} {
+                               continue
+                       }
+
                        # Wait upto 1 second for target to halt.  Why 1sec? Cause
                        # the JTAG tap reset signal might be hooked to a slow
                        # resistor/capacitor circuit - and it might take a while
@@ -247,6 +218,10 @@ proc ocd_process_reset { MODE } {
        #Pass 2 - if needed "init"
        if { 0 == [string compare init $MODE] } {
                foreach t [target names] {
+                       if {[jtag tapisenabled [$t cget -chain-position]] == 0} {
+                               continue
+                       }
+
                        set err [catch "$t arp_waitstate halted 5000"]
                        # Did it halt?
                        if { $err == 0 } {
@@ -277,19 +252,6 @@ proc production_test {} {
 }
 add_help_text production "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script."
 
-proc load {args} {
-       return [eval "load_image $args"]
-}
-add_help_text load "synonym to load_image"
-
-proc verify {args} {
-       return [eval "verify_image $args"]
-}
-
-add_help_text verify "synonym to verify_image"
-
-
-
 add_help_text cpu "<name> - prints out target options and a comment on CPU which matches name"
 
 # A list of names of CPU and options required
@@ -327,3 +289,31 @@ proc cpu {args} {
        }
 }
 
+proc power_restore {} {
+       puts "Sensed power restore."
+       reset init
+}
+
+add_help_text power_restore "Overridable procedure run when power restore is detected. Runs 'reset init' by default."
+
+proc power_dropout {} {
+       puts "Sensed power dropout."
+}
+
+proc srst_deasserted {} {
+       puts "Sensed nSRST deasserted."
+       reset init
+}
+add_help_text srst_deasserted "Overridable procedure run when srst deassert is detected. Runs 'reset init' by default."
+
+proc srst_asserted {} {
+       puts "Sensed nSRST asserted."
+}
+
+# catch any exceptions, capture output and return output
+proc capture_catch {a} {
+       catch {
+               capture {uplevel $a}
+       } result
+       return $result 
+}