Menu
▾
▴
[Openocd-svn] r1252 - in zy1000/trunk/build: menu tcl
|
From: <oh...@ma...> - 2008-12-17 10:57:05
|
Author: oharboe
Date: 2008-12-17 10:56:59 +0100 (Wed, 17 Dec 2008)
New Revision: 1252
Modified:
zy1000/trunk/build/menu/zy1000menu.xml
zy1000/trunk/build/menu/zy1000menu.xsl
zy1000/trunk/build/tcl/openocd.cfg
Log:
retire unused code
Modified: zy1000/trunk/build/menu/zy1000menu.xml
===================================================================
--- zy1000/trunk/build/menu/zy1000menu.xml 2008-12-16 22:20:10 UTC (rev 1251)
+++ zy1000/trunk/build/menu/zy1000menu.xml 2008-12-17 09:56:59 UTC (rev 1252)
@@ -62,9 +62,9 @@
append buffer [ocd_jtag_khz]
</tcl>
<br>
- <tcl>append buffer [openocd {zy1000_version zy1000}]</tcl><br>
- <tcl>append buffer [openocd {zy1000_version openocd}]</tcl><br>
- <tcl>append buffer [openocd {zy1000_version date}]</tcl><br>
+ <tcl>append buffer [capture {zy1000_version zy1000}]</tcl><br>
+ <tcl>append buffer [capture {zy1000_version openocd}]</tcl><br>
+ <tcl>append buffer [capture {zy1000_version date}]</tcl><br>
<tcl>append buffer [ip]</tcl><br>
<tcl>append buffer [ocd_gdb_port]</tcl>
</td>
@@ -100,25 +100,25 @@
set form_action [formfetch form_action]
if {[string compare $form_action "Halt"]==0} {
- append console [encode [openocd "halt"]]
+ append console [encode [capture "halt"]]
}
if {[string compare $form_action "Resume"]==0} {
- append console [encode [openocd "resume"]]
+ append console [encode [capture "resume"]]
}
if {[string compare $form_action "Reset and run"]==0} {
- append console [encode [openocd "reset run"]]
+ append console [encode [capture "reset run"]]
}
if {[string compare $form_action "Power on"]==0} {
- append console [encode [openocd "power on"]]
+ append console [encode [capture "power on"]]
}
if {[string compare $form_action "Power off"]==0} {
- append console [encode [openocd "power off"]]
+ append console [encode [capture "power off"]]
}
</tcl>
- <tcl>append console [encode [openocd poll]]</tcl>
+ <tcl>append console [encode [capture poll]]</tcl>
</td>
</tr>
</table>
@@ -184,8 +184,8 @@
append buffer {<form enctype="multipart/form-data" action="preconfig.tcl" method="post">}
if {[string compare $form_action "Select and reload"]==0} {
- openocd "trunc /config/settings/openocd.cfg"
- openocd "append_file /config/settings/openocd.cfg script target/$form_target"
+ capture "trunc /config/settings/openocd.cfg"
+ capture "append_file /config/settings/openocd.cfg script target/$form_target"
reboot
}
@@ -271,7 +271,7 @@
}
if {[string compare $form_action "Delete"]==0} {
- openocd "rm /config/settings/$form_selected"
+ capture "rm /config/settings/$form_selected"
}
if {[string compare $form_action "Save"]==0} {
@@ -463,9 +463,9 @@
set form_action [formfetch form_action]
if {[string compare $form_action "Reset CPU and probe flash"]==0} {
- append console [encode [openocd "reset init"]]
- append buffer [encode [openocd "flash probe 0"]]
- append buffer [encode [openocd "flash info 0"]]
+ append console [encode [capture "reset init"]]
+ append buffer [encode [capture "flash probe 0"]]
+ append buffer [encode [capture "flash info 0"]]
}
} else {
append buffer "No flash bank configured."
@@ -540,7 +540,7 @@
set action_verify [expr {[string compare $form_action "Verify"]==0 || [string compare $form_action "Flash and verify"]==0}]
if {$action_reset} {
- append console [encode [openocd "reset init"]]
+ append console [encode [capture "reset init"]]
}
</tcl>
</code><tcl>
@@ -594,7 +594,7 @@
}
append buffer "<br>"
if {$action_flash} {
- append console [encode [openocd "halt"]]
+ append console [encode [capture "halt"]]
append buffer "<b>"
if {[catch {capture {eval "flash write_image erase $upload_filename $form_offset $form_type"}} result]} {
append buffer "Flash write failed<br>"
@@ -606,7 +606,7 @@
append buffer "</b>"
}
if {$action_verify} {
- append console [encode [openocd "halt"]]
+ append console [encode [capture "halt"]]
append buffer "<b>"
if {[catch {capture {eval "verify_image $upload_filename $form_offset $form_type"}} result]} {
append buffer "Verify failed<br>"
@@ -674,10 +674,10 @@
append console [encode [capture {catch production_test}]]
}
if {[string compare $form_action "Power on"]==0} {
- append console [encode [openocd "power on"]]
+ append console [encode [capture "power on"]]
}
if {[string compare $form_action "Power off"]==0} {
- append console [encode [openocd "power off"]]
+ append console [encode [capture "power off"]]
}
</tcl>
</code>
@@ -751,8 +751,8 @@
if {[string compare $form_address ""]!=0} {
if {[string compare $form_action "Erase"]==0} {
append buffer "<code style=\"white-space: nowrap;\">"
- append console [encode [openocd "reset init"]]
- append console [encode [openocd "flash erase_address $form_address $form_length"]]
+ append console [encode [capture "reset init"]]
+ append console [encode [capture "flash erase_address $form_address $form_length"]]
append buffer </code>
}
}
@@ -808,25 +808,25 @@
set form_action [formfetch form_action]
if {[string compare $form_action "Run from address"]==0} {
- append console [encode [openocd "halt"]]
- append console [encode [openocd "wait_halt"]]
- append console [encode [openocd "resume $form_address"]]
+ append console [encode [capture "halt"]]
+ append console [encode [capture "wait_halt"]]
+ append console [encode [capture "resume $form_address"]]
}
if {[string compare $form_action "Halt"]==0} {
- append console [encode [openocd "halt"]]
- append console [encode [openocd "wait_halt"]]
+ append console [encode [capture "halt"]]
+ append console [encode [capture "wait_halt"]]
}
if {[string compare $form_action "Reset and run"]==0} {
- append console [encode [openocd "reset run"]]
+ append console [encode [capture "reset run"]]
}
if {[string compare $form_action "Reset and init"]==0} {
- append console [encode [openocd "reset init"]]
+ append console [encode [capture "reset init"]]
}
-append console [encode [openocd poll]]
+append console [encode [capture poll]]
</tcl>
@@ -941,10 +941,10 @@
set form_address "0x[tohex [expr $form_address+$form_length]]"
}
if {[string compare $form_action "Modify"]==0} {
- append console [openocd "$modify_cmd $form_address $form_value"]
+ append console [capture "$modify_cmd $form_address $form_value"]
}
if {[string compare $form_action "Fill"]==0} {
- append console [openocd "$modify_cmd $form_address $form_value $form_length"]
+ append console [capture "$modify_cmd $form_address $form_value $form_length"]
}
}
@@ -992,8 +992,8 @@
<code style="white-space: nowrap; font-size:11px;font:courier new;">
<tcl>
if {[string compare $form_address ""]!=0} {
- append console [encode [openocd halt]]
- append buffer [encode [openocd "$form_type $form_address [expr $form_length]"]]
+ append console [encode [capture halt]]
+ append buffer [encode [capture "$form_type $form_address [expr $form_length]"]]
}
</tcl>
</code>
@@ -1051,8 +1051,8 @@
</form>
<tcl>
if {[string compare $form_action "Download"]==0} {
- append console [encode [openocd "reset init"]]
- append console [encode [openocd "dump_image /ram/dump.bin $form_address $form_length"]]
+ append console [encode [capture "reset init"]]
+ append console [encode [capture "dump_image /ram/dump.bin $form_address $form_length"]]
</tcl>
<form action="../dump.bin" target="_blank">
<input type="submit" name="form_action" value="Save downloaded memory">
@@ -1344,7 +1344,7 @@
} err
}
if {[string compare $form_action "Delete"]==0} {
- openocd "rm $form_filename"
+ capture "rm $form_filename"
}
set form_edittext_subst [to_textarea $form_edittext]
@@ -1560,9 +1560,9 @@
set form_config [load_config "target/[load_target]"]
set support_id [string range [rand] 0 7]
set form_log ""
- append form_log "Version: [openocd "zy1000_version zy1000"]"
- append form_log "OpenOCD version: [openocd "zy1000_version openocd"]"
- append form_log "Version date: [openocd "zy1000_version date"]"
+ append form_log "Version: [capture "zy1000_version zy1000"]"
+ append form_log "OpenOCD version: [capture "zy1000_version openocd"]"
+ append form_log "Version date: [capture "zy1000_version date"]"
append form_log [log]
</tcl>
Modified: zy1000/trunk/build/menu/zy1000menu.xsl
===================================================================
--- zy1000/trunk/build/menu/zy1000menu.xsl 2008-12-16 22:20:10 UTC (rev 1251)
+++ zy1000/trunk/build/menu/zy1000menu.xsl 2008-12-17 09:56:59 UTC (rev 1252)
@@ -36,7 +36,7 @@
</div>
<div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
<div class="textlight" style="position:relative;left:15px;top:4px;">
- <tcl>append buffer [openocd zy1000_version]</tcl>
+ <tcl>append buffer [capture zy1000_version]</tcl>
</div>
</div>
</div>
Modified: zy1000/trunk/build/tcl/openocd.cfg
===================================================================
--- zy1000/trunk/build/tcl/openocd.cfg 2008-12-16 22:20:10 UTC (rev 1251)
+++ zy1000/trunk/build/tcl/openocd.cfg 2008-12-17 09:56:59 UTC (rev 1252)
@@ -2,12 +2,7 @@
-proc openocd {cmd} {
- catch "ocd_$cmd" t
- return $t
-}
-
proc tohex {a} {
set r ""
while 1 {
|
