Duane Ellis: "target as an [tcl] object" feature.

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

17 files changed, 42 insertions, 65 deletions

diff --git a/src/target/target/aduc702x.cfg b/src/target/target/aduc702x.cfg
index fdffbfea..3bc474f2 100644
--- a/src/target/target/aduc702x.cfg
+++ b/src/target/target/aduc702x.cfg
@@ -34,5 +34,5 @@ proc watchdog_service {} {
     set watchdog_hdl [after 500 watchdog_service]
 }
 
-proc target_0_post_halt {} { watchdog_service }
-proc arget_0_pre_resume {} { global watchdog_hdl; after cancel $watchdog_hdl }
+[new_target_name] configure -event old-post_halt {  watchdog_service }
+[new_target_name] configure -event old-pre_resume { global watchdog_hdl; after cancel $watchdog_hdl }
diff --git a/src/target/target/at91eb40a.cfg b/src/target/target/at91eb40a.cfg
index f3fa08fe..b49150a7 100644
--- 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
 
-proc target_0_post_reset {} {
+[new_target_name] configure -event old-post_reset {
 	puts "Running reset init script for AT91EB40A"
 	global reset_count
 	# Reset script for AT91EB40a
@@ -46,10 +46,9 @@ proc target_0_post_reset {} {
 	set reset_count [expr $reset_count+1]
 	echo "Testing reset $reset_count !"
 	
-	asdfs
 }
 
-proc target_0_pre_reset {} {
+[new_target_name] configure -event old-pre_reset {
 	global reset_count
 	set reset_count [expr $reset_count+1]
 	echo "Testing pre_reset $reset_count !"
diff --git a/src/target/target/at91r40008.cfg b/src/target/target/at91r40008.cfg
index e62a744c..7c4be18e 100644
--- a/src/target/target/at91r40008.cfg
+++ b/src/target/target/at91r40008.cfg
@@ -13,7 +13,7 @@ jtag_device 4 0x1 0xf 0xe
 target arm7tdmi little 0 arm7tdmi
 
 
-target_script 0 reset event/at91r40008_reset.script
+[new_target_name] configure -event old-gdb_program_config { script event/at91r40008_reset.script }
 
 working_area 0 0x3C000 0x4000 nobackup 
 flash bank cfi 0x10000000 0x400000 2 2 0
diff --git a/src/target/target/at91sam9260.cfg b/src/target/target/at91sam9260.cfg
index 21f92d79..f0f7929e 100644
--- 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
 
-target_script 0 reset event/at91sam9260_reset.script
+[new_target_name] configure -event old-post_reset { 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 c33b4298..15f96858 100644
--- 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
 
 
-target_script 0 reset event/eir-sam7se512_reset.script
+[new_target_name] configure -event old-post_reset { 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 9daef590..6a4319f3 100644
--- a/src/target/target/hammer.cfg
+++ b/src/target/target/hammer.cfg
@@ -10,12 +10,12 @@ jtag_device 4 0x1 0xf 0xe
 
 
 target arm920t little 0 arm920t
+[new_target_name] configure -event old-post_reset { script event/hammer_reset.script }
 
 # speed up memory downloads
 arm7 fast_memory_access enable
 arm7_9 dcc_downloads enable
 
-target_script 0 reset event/hammer_reset.script
 
 working_area 0 0x30800000 0x20000 nobackup
 
diff --git a/src/target/target/lpc2148.cfg b/src/target/target/lpc2148.cfg
index e76aa024..79ec9ecb 100644
--- a/src/target/target/lpc2148.cfg
+++ b/src/target/target/lpc2148.cfg
@@ -14,8 +14,7 @@ reset_config trst_and_srst srst_pulls_trst
 jtag_device 4 0x1 0xf 0xe
 
 target arm7tdmi little 0 arm7tdmi-s_r4
-
-proc target_0_post_reset {} {
+[new_target_name] configure -event old-post_reset {} {
 	# 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 3a8f4154..a00e9bf1 100644
--- a/src/target/target/omap5912.cfg
+++ b/src/target/target/omap5912.cfg
@@ -11,8 +11,7 @@ jtag_device 4  0x1 0x0 0xe
 jtag_device 8  0x0 0x0 0x0
 
 target arm926ejs little 1 arm926ejs
-target_script 0 reset event/omap5912_reset.script
-
+[new_target_name] configure -event old-post_reset { 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 b712cf37..daa49345 100644
--- a/src/target/target/pxa255.cfg
+++ b/src/target/target/pxa255.cfg
@@ -1,11 +1,13 @@
 jtag_device 5 0x1 0x1f 0x1e
 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 }
+
 reset_config trst_and_srst
 
 
-target_script 0 reset event/pxa255_reset.script
 
 #xscale debug_handler 0  0xFFFF0800      # debug handler base address
 
diff --git a/src/target/target/sam7x256.cfg b/src/target/target/sam7x256.cfg
index 663ac110..34556f87 100644
--- a/src/target/target/sam7x256.cfg
+++ b/src/target/target/sam7x256.cfg
@@ -8,9 +8,7 @@ jtag_device 4 0x1 0xf 0xe
 #target <type> <startup mode>
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm7tdmi little 0 arm7tdmi
-
-
-target_script 0 reset event/sam7x256_reset.script
+[new_target_name] configure -event old-post_reset { 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 45ea7055..59e7e179 100644
--- a/src/target/target/str710.cfg
+++ b/src/target/target/str710.cfg
@@ -1,11 +1,6 @@
 #start slow, speed up after reset
 jtag_khz 10
-proc target_0_pre_reset {} {
-	jtag_khz 10
-}
-proc target_0_post_reset {} {
-	jtag_khz 6000
-}
+
 
 #use combined on interfaces or targets that can't set TRST/SRST separately
 reset_config trst_and_srst srst_pulls_trst
@@ -17,9 +12,9 @@ jtag_device 4 0x1 0xf 0xe
 #target <type> <startup mode>
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm7tdmi little 0 arm7tdmi
-
-
-target_script 0 gdb_program_config event/str710_program.script
+[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 old-gdb_program_config { script event/str710_program.script }
 
 
 working_area 0 0x2000C000 0x4000 nobackup
diff --git a/src/target/target/str730.cfg b/src/target/target/str730.cfg
index 837dbcf4..a65f75a0 100644
--- a/src/target/target/str730.cfg
+++ b/src/target/target/str730.cfg
@@ -2,12 +2,6 @@
 
 
 jtag_khz 3000
-proc target_0_pre_reset {} {
-	jtag_khz 10
-}
-proc target_0_post_reset {} {
-	jtag_khz 3000
-}
 
 
 #use combined on interfaces or targets that can’t set TRST/SRST separately
@@ -23,10 +17,9 @@ jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
 target arm7tdmi little 0 arm7tdmi
-
-
-
-target_script 0 gdb_program_config event/str730_program.script
+[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 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 8572e1bd..7a8fde41 100644
--- a/src/target/target/str750.cfg
+++ b/src/target/target/str750.cfg
@@ -2,12 +2,7 @@
 
 # jtag speed
 jtag_khz 10
-proc target_0_pre_reset {} {
-	jtag_khz 10
-}
-proc target_0_post_reset {} {
-	jtag_khz 3000
-}
+
 
 #use combined on interfaces or targets that can’t set TRST/SRST separately
 #reset_config trst_and_srst srst_pulls_trst
@@ -25,9 +20,9 @@ jtag_ntrst_delay 500
 #target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
 target arm7tdmi little 0 arm7tdmi
 
-
-
-target_script 0 gdb_program_config event/str750_program.script
+[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 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 ca2fb8ca..2e0056a6 100644
--- a/src/target/target/str912.cfg
+++ b/src/target/target/str912.cfg
@@ -3,23 +3,6 @@
 # jtag speed. We need to stick to 16kHz until we've finished reset.
 
 jtag_rclk 16
-proc target_0_pre_reset {} {
-	jtag_rclk 16
-}
-
-proc target_0_post_reset {} {
-	# We can increase speed now that we know the target is halted.
-	jtag_rclk 3000
-	
-	# -- Enable 96K RAM
-	# PFQBC enabled / DTCM & AHB wait-states disabled
-	mww 0x5C002034 0x0191 
-
-	str9x flash_config 0 4 2 0 0x80000
-	flash protect 0 0 7 off
-	
-	
-}
 
 
 jtag_nsrst_delay 100
@@ -38,6 +21,20 @@ 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 old-post_reset {
+	# We can increase speed now that we know the target is halted.
+	jtag_rclk 3000
+	
+	# -- Enable 96K RAM
+	# PFQBC enabled / DTCM & AHB wait-states disabled
+	mww 0x5C002034 0x0191 
+
+	str9x flash_config 0 4 2 0 0x80000
+	flash protect 0 0 7 off
+}
+
 
 
 working_area 0 0x50000000 16384 nobackup
diff --git a/src/target/target/wi-9c.cfg b/src/target/target/wi-9c.cfg
index eccb8fa4..08f326e6 100644
--- 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
 
-target_script 0 reset event/wi-9c_reset.script
+[new_target_name] configure -event old-post_reset { 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 c65f7350..dcac9dd2 100644
--- 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
-target_script 0 reset event/xba_revA3.script
+[new_target_name] configure -event old-post_reset { script event/xba_revA3.script }
 
 
 flash bank cfi 0x50000000 0x400000 2 2 0
diff --git a/src/target/target/zy1000.cfg b/src/target/target/zy1000.cfg
index 9e8cdb9c..7a1b8b98 100644
--- a/src/target/target/zy1000.cfg
+++ b/src/target/target/zy1000.cfg
@@ -21,7 +21,7 @@ arm7_9 fast_memory_access enable
 arm7_9 dcc_downloads enable
 
 flash bank ecosflash 0x01000000 0x200000 2 2 0 ecos/at91eb40a.elf
-target_script 0 reset event/zy1000_reset.script
+[new_target_name] configure -event old-post_reset { script event/zy1000_reset.script }
 
 # required for usable performance. Used for lots of
 # other things than flash programming.