reset cleanup. Remove obsolete events that are not needed for compatibility.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1053 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index a8006702b72304951651625697e156a19e70b31f..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,9 +212,6 @@ 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
     }
@@ -271,7 +268,6 @@ proc ocd_process_reset { MODE } {
                    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              
                    }
                }

diff --git a/src/target/target.c b/src/target/target.c
index f843a6ed51bffd25e4f1d706f5d6d6c1d71db579..6a5c890221cfe36ee58ebc31904379115115f866 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -162,9 +162,7 @@ const char *target_strerror_safe( int err )
 }
 
 const Jim_Nvp nvp_target_event[] = {
-       { .value = TARGET_EVENT_OLD_pre_reset          , .name = "old-pre_reset" },
        { .value = TARGET_EVENT_OLD_gdb_program_config , .name = "old-gdb_program_config" },
-       { .value = TARGET_EVENT_OLD_post_reset         , .name = "old-post_reset" },
        { .value = TARGET_EVENT_OLD_pre_resume         , .name = "old-pre_resume" },
 
 

diff --git a/src/target/target/at91eb40a.cfg b/src/target/target/at91eb40a.cfg
index b49150a78571aed533f09e1491c3b0b70da21b19..42ce2f3fca8bd23930080152ce3e4a07d1fbb2a1 100644 (file)
--- a/src/target/target/at91eb40a.cfg
+++ b/src/target/target/at91eb40a.cfg
@@ -32,7 +32,7 @@ working_area 0 0x00000000 0x20000 nobackup
 global reset_count
 set reset_count 0
 
-[new_target_name] configure -event old-post_reset {
+[new_target_name] configure -event reset-init {
        puts "Running reset init script for AT91EB40A"
        global reset_count
        # Reset script for AT91EB40a
@@ -48,7 +48,7 @@ set reset_count 0
        
 }
 
-[new_target_name] configure -event old-pre_reset {
+[new_target_name] configure -event reset-start {
        global reset_count
        set reset_count [expr $reset_count+1]
        echo "Testing pre_reset $reset_count !"

diff --git a/src/target/target/at91sam9260.cfg b/src/target/target/at91sam9260.cfg
index f0f7929ecbe36fea98a024bc325680485d03c9a4..a9ef6a0de56b73eeb5f74bb7188dddbab466addf 100644 (file)
--- a/src/target/target/at91sam9260.cfg
+++ b/src/target/target/at91sam9260.cfg
@@ -17,7 +17,7 @@ jtag_ntrst_delay 0
 #target <type> <endianess> <reset mode> <JTAG pos> <variant>
 target arm926ejs little 0 arm926ejs
 
-[new_target_name] configure -event old-post_reset { script event/at91sam9260_reset.script }
+[new_target_name] configure -event reset-init { script event/at91sam9260_reset.script }
 
 
 #working area <target#> <address> <size> <backup|nobackup>

diff --git a/src/target/target/eir-sam7se512.cfg b/src/target/target/eir-sam7se512.cfg
index 15f96858974c6a262b02d78a7e9664d220f4ea31..a378a203bed06f80cf4bb2a5cb242b7d6d6f4534 100644 (file)
--- a/src/target/target/eir-sam7se512.cfg
+++ b/src/target/target/eir-sam7se512.cfg
@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
 target arm7tdmi little 0 arm7tdmi
 
 
-[new_target_name] configure -event old-post_reset { script event/eir-sam7se512_reset.script }
+[new_target_name] configure -event reset-init { script event/eir-sam7se512_reset.script }
 
 working_area 0 0x00200000 0x4000 nobackup
 

diff --git a/src/target/target/hammer.cfg b/src/target/target/hammer.cfg
index 6a4319f392c6929de72d2658777c0ef22a3dd2a1..627266d2282815c6ec1d7dd7523b30dccf716aed 100644 (file)
--- a/src/target/target/hammer.cfg
+++ b/src/target/target/hammer.cfg
@@ -10,7 +10,7 @@ jtag_device 4 0x1 0xf 0xe
 
 
 target arm920t little 0 arm920t
-[new_target_name] configure -event old-post_reset { script event/hammer_reset.script }
+[new_target_name] configure -event reset-init { script event/hammer_reset.script }
 
 # speed up memory downloads
 arm7 fast_memory_access enable

diff --git a/src/target/target/lpc2148.cfg b/src/target/target/lpc2148.cfg
index 11835a72d1f5432bc1461be175198d6a69d9248b..67b3d11c7ebcecec6175074228cc6f262ba17a08 100644 (file)
--- a/src/target/target/lpc2148.cfg
+++ b/src/target/target/lpc2148.cfg
@@ -14,7 +14,7 @@ reset_config trst_and_srst srst_pulls_trst
 jtag_device 4 0x1 0xf 0xe
 
 target arm7tdmi little 0 arm7tdmi-s_r4
-[new_target_name] configure -event old-post_reset {
+[new_target_name] configure -event reset-init {
        # Force target into ARM state
        soft_reset_halt
        #do not remap 0x0000-0x0020 to anything but the flash

diff --git a/src/target/target/omap5912.cfg b/src/target/target/omap5912.cfg
index a00e9bf1f4b293ae6fda1acca1eb5725af2b4d93..fdc8e71f05fdaa22bc3764f440c5455686ab3ca9 100644 (file)
--- a/src/target/target/omap5912.cfg
+++ b/src/target/target/omap5912.cfg
@@ -11,7 +11,7 @@ jtag_device 4  0x1 0x0 0xe
 jtag_device 8  0x0 0x0 0x0
 
 target arm926ejs little 1 arm926ejs
-[new_target_name] configure -event old-post_reset { script event/omap5912_reset.script }
+[new_target_name] configure -event reset-init { script event/omap5912_reset.script }
 
 # omap5912 lcd frame buffer as working area
 working_area 0 0x20000000 0x3e800 nobackup

diff --git a/src/target/target/pxa255.cfg b/src/target/target/pxa255.cfg
index daa493459a65c6259b494c4034e36e173a2bc56f..6a5c12bb5de45364200794245587a990f23f2963 100644 (file)
--- a/src/target/target/pxa255.cfg
+++ b/src/target/target/pxa255.cfg
@@ -3,7 +3,7 @@ jtag_nsrst_delay 200
 jtag_ntrst_delay 200
 
 target xscale little 0 pxa255
-[new_target_name] configure -event old-post_reset { script event/pxa255_reset.script }
+[new_target_name] configure -event reset-init { script event/pxa255_reset.script }
 
 reset_config trst_and_srst
 

diff --git a/src/target/target/sam7x256.cfg b/src/target/target/sam7x256.cfg
index 34556f87c0aad6606e519f9199226763dfbe82d3..e0030c7a76701ab83df533c1f0496d487666d54c 100644 (file)
--- a/src/target/target/sam7x256.cfg
+++ b/src/target/target/sam7x256.cfg
@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
 #target <type> <startup mode>
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm7tdmi little 0 arm7tdmi
-[new_target_name] configure -event old-post_reset { script event/sam7x256_reset.script }
+[new_target_name] configure -event reset-init { script event/sam7x256_reset.script }
 
 working_area 0 0x00200000 0x4000 nobackup
 

diff --git a/src/target/target/str710.cfg b/src/target/target/str710.cfg
index 59e7e1795dedf259a951a7bf8424265961f4be24..ea57e9f76c3c34f88f44a648b738fc6c6f60a99f 100644 (file)
--- a/src/target/target/str710.cfg
+++ b/src/target/target/str710.cfg
@@ -12,8 +12,8 @@ jtag_device 4 0x1 0xf 0xe
 #target <type> <startup mode>
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm7tdmi little 0 arm7tdmi
-[new_target_name] configure -event old-pre_reset { jtag_khz 10 }
-[new_target_name] configure -event old-post_reset { jtag_khz 6000 }
+[new_target_name] configure -event reset-start { jtag_khz 10 }
+[new_target_name] configure -event reset-init { jtag_khz 6000 }
 [new_target_name] configure -event old-gdb_program_config { script event/str710_program.script }
 
 

diff --git a/src/target/target/str730.cfg b/src/target/target/str730.cfg
index a65f75a05b5ae8563dfd50408f06953dc8b25e3f..2851befb449debe9fc19cf4a11693b31dc86700a 100644 (file)
--- a/src/target/target/str730.cfg
+++ b/src/target/target/str730.cfg
@@ -17,8 +17,8 @@ jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
 target arm7tdmi little 0 arm7tdmi
-[new_target_name] configure -event old-pre_reset { jtag_khz 10 }
-[new_target_name] configure -event old-post_reset { jtag_khz 3000 }
+[new_target_name] configure -event reset-start { jtag_khz 10 }
+[new_target_name] configure -event reset-init { jtag_khz 3000 }
 [new_target_name] configure -event old-gdb_program_config { script event/str730_program.script }
 
 working_area 0 0x40000000 0x4000 nobackup

diff --git a/src/target/target/str750.cfg b/src/target/target/str750.cfg
index 7a8fde4149c9d11c542165edcaec81867879b07c..d5fa45e8e2755057a6322ce7e173183f9bae85ed 100644 (file)
--- a/src/target/target/str750.cfg
+++ b/src/target/target/str750.cfg
@@ -20,8 +20,8 @@ jtag_ntrst_delay 500
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm7tdmi little 0 arm7tdmi
 
-[new_target_name] configure -event old-pre_reset  { jtag_khz 10 }
-[new_target_name] configure -event old-post_reset { jtag_khz 3000 }
+[new_target_name] configure -event reset-start  { jtag_khz 10 }
+[new_target_name] configure -event reset-init { jtag_khz 3000 }
 [new_target_name] configure -event old-gdb_program_config { script event/str750_program.script }
 
 working_area 0 0x40000000 0x4000 nobackup

diff --git a/src/target/target/str912.cfg b/src/target/target/str912.cfg
index 2e0056a63a1b2855dbc4474190367ecb411b0bda..cd0ec11c62b330b5b41a8610fc87c9a52648103c 100644 (file)
--- a/src/target/target/str912.cfg
+++ b/src/target/target/str912.cfg
@@ -21,9 +21,9 @@ jtag_device 5 0x1 0x1 0x1e
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm966e little 1 arm966e
 
-[new_target_name] configure -event old-pre_reset { jtag_rclk 16 }
+[new_target_name] configure -event reset-start { jtag_rclk 16 }
 
-[new_target_name] configure -event old-post_reset {
+[new_target_name] configure -event reset-init {
        # We can increase speed now that we know the target is halted.
        jtag_rclk 3000
        

diff --git a/src/target/target/wi-9c.cfg b/src/target/target/wi-9c.cfg
index 08f326e60650f5b2e9643c04140117bd4bda2b6b..71acf0fcd8615ee4a7310b7c5c508019f1e7a823 100644 (file)
--- a/src/target/target/wi-9c.cfg
+++ b/src/target/target/wi-9c.cfg
@@ -17,7 +17,7 @@ jtag_ntrst_delay 0
 #target <type> <endianess> <reset mode> <JTAG pos> <variant>
 target arm926ejs big 0 arm926ejs
 
-[new_target_name] configure -event old-post_reset { script event/wi-9c_reset.script }
+[new_target_name] configure -event reset-init { script event/wi-9c_reset.script }
 
 
 #working area <target#> <address> <size> <backup|nobackup>

diff --git a/src/target/target/xba_revA3.cfg b/src/target/target/xba_revA3.cfg
index dcac9dd219478db8a5dbe4879fa78e843db8673b..4c750b5baaa536df2c38327d376e35792747ee7a 100644 (file)
--- a/src/target/target/xba_revA3.cfg
+++ b/src/target/target/xba_revA3.cfg
@@ -10,7 +10,7 @@ jtag_ntrst_delay 100
 jtag_device 7 0x1 0x7f 0x7e
 
 target  xscale big           0          ixp42x
-[new_target_name] configure -event old-post_reset { script event/xba_revA3.script }
+[new_target_name] configure -event reset-init { script event/xba_revA3.script }
 
 
 flash bank cfi 0x50000000 0x400000 2 2 0