Duane Ellis: added missing invocation of reset-init

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index e60ad976f467b2fa1fee7f846a633c10cf2bcbe4..e3d750e08ae7a075724bd29fbf08a0b17a739acd 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -109,18 +109,40 @@ proc unknown {args} {
        return -code error "Unknown command: $args"
 }
 
+proc new_target_name { } {
+    return [target number [expr [target count] - 1 ]]
+}
+
 
 proc target_script {target_num eventname scriptname} {
-       if {[string compare $eventname reset]==0} {
-               set eventname post_reset
-       }
 
-       # This is the script we invoke
-       proc "target_[set target_num]_[set eventname]" {} "script $scriptname" 
-       
+    set tname [target number $target_num]
+    
+    if { 0 == [string compare $eventname "reset"] } {
+       $tname configure -event old-post_reset "script $scriptname"
+       return
+    }
+
+    if { 0 == [string compare $eventname "post_reset"] } {
+       $tname configure -event old-post_reset "script $scriptname"
+       return
+    }
+
+    if { 0 == [string compare $eventname "pre_reset"] } {
+       $tname configure -event old-pre_reset "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 "<target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"
+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
@@ -160,4 +182,102 @@ 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
+}
+
+
+# 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...
+    set halt -1
+    if { 0 == [string compare $MODE halt] } {
+       set halt 1
+    }
+    if { 0 == [string compare $MODE init] } {
+       set halt 1;
+    }
+    if { 0 == [string compare $MODE run ] } {
+       set halt 0;
+    }
+    if { $halt < 0 } {
+       return -error "Invalid mode: $MODE, must be one of: halt, init, or run";
+    }
+
+    foreach t [ target names ] {
+       # For compatiblity with 'old scripts'
+       $t invoke-event old-pre_reset
+
+       # New event script.
+       $t invoke-event reset-start
+    }
+
+    # Init the tap controller.
+    jtag arp_init-reset
+
+    # Examine all targets.
+    foreach t [ target names ] {
+       $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
+       $t invoke-event reset-assert-post
+    }
+
+    # Now de-assert reset.
+    foreach t [ target names ] {
+       $t invoke-event reset-deassert-pre
+       # Again, de-assert code needs to know..
+       $t arp_reset deassert $halt
+       $t invoke-event reset-deassert-post
+    }
+
+
+    # Pass 1 - Now try to halt.
+    if { $halt } {
+       foreach t [target names] {
+
+           # 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
+           # to charge
+           
+           # Catch, but ignore any errors.
+           catch { $t arp_waitstate halted 1000 }
+           
+           # Did we succeed?
+           set s [$t curstate]
+           
+           if { 0 != [string compare $s "halted" ] } {
+               return -error [format "TARGET: %s - Not halted" $t]
+           }
+       }
+    }
+
+    #Pass 2 - if needed "init"
+    if { 0 == [string compare init $MODE] } {
+       foreach t [target names] {
+           set err [catch "$t arp_waitstate halted 5000"]
+           # Did it halt?
+           if { $err == 0 } {
+                       $t invoke-event old-post_reset
+                       $t invoke-event reset-init              
+           }
+       }
+    }
+
+    foreach t [ target names ] {
+       $t invoke-event reset-end
+    }
+}