Laurentiu Cocanu - memory read/write and exit() error path fixes

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index e3d750e08ae7a075724bd29fbf08a0b17a739acd..f683c9246fb39eb49d17ea7fbfd5baffa866f324 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -119,17 +119,17 @@ proc target_script {target_num eventname scriptname} {
     set tname [target number $target_num]
     
     if { 0 == [string compare $eventname "reset"] } {
-       $tname configure -event old-post_reset "script $scriptname"
+       $tname configure -event reset-init "script $scriptname"
        return
     }
 
     if { 0 == [string compare $eventname "post_reset"] } {
-       $tname configure -event old-post_reset "script $scriptname"
+       $tname configure -event reset-init "script $scriptname"
        return
     }
 
     if { 0 == [string compare $eventname "pre_reset"] } {
-       $tname configure -event old-pre_reset "script $scriptname"
+       $tname configure -event reset-start "script $scriptname"
        return
     }
 
@@ -212,11 +212,8 @@ proc ocd_process_reset { MODE } {
     }
 
     foreach t [ target names ] {
-       # For compatiblity with 'old scripts'
-       $t invoke-event old-pre_reset
-
-       # New event script.
-       $t invoke-event reset-start
+               # New event script.
+               $t invoke-event reset-start
     }
 
     # Init the tap controller.
@@ -224,60 +221,59 @@ proc ocd_process_reset { MODE } {
 
     # Examine all targets.
     foreach t [ target names ] {
-       $t arp_examine
+               $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
+               $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
+               $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]
-           }
-       }
+               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] {
+                   set err [catch "$t arp_waitstate halted 5000"]
+                   # Did it halt?
+                   if { $err == 0 } {
+                               $t invoke-event reset-init              
+                   }
+               }
     }
 
     foreach t [ target names ] {
-       $t invoke-event reset-end
+               $t invoke-event reset-end
     }
 }