gdbserver: incorrect memory map for multiple targets (bug #24)

[fw/openocd] / src / server / httpd / httpd.tcl

diff --git a/src/server/httpd/httpd.tcl b/src/server/httpd/httpd.tcl
index b579411456d44655f71f397d11b75dc87ebd914f..dfa9e335cbb5e13117e0ff9d1de1c881b1c8029e 100644 (file)
--- a/src/server/httpd/httpd.tcl
+++ b/src/server/httpd/httpd.tcl
@@ -1,108 +1,100 @@
-# some dummy proc's to get things going for test purposes\r
-\r
-\r
-\r
-proc ip {} {\r
-return 10.0.0.55\r
-}\r
-\r
-proc start_chunked {a} {\r
-       global httpdata\r
-       global httpmime\r
-       set httpmime $a\r
-       set httpdata ""\r
-}\r
-\r
-proc write_chunked {a} {\r
-       global httpdata\r
-       append httpdata $a\r
-}\r
-\r
-proc end_chunked {} {\r
-}\r
-\r
-\r
-\r
-#proc formfetch {a} {\r
-#      global httppostdata\r
-       #catch { \r
-#      echo "$a=$httppostdata($a)"\r
-       #return $httppostdata($a) \r
-       #}\r
-#      \r
-       #return ""  \r
-#}\r
-\r
-\r
-\r
-\r
-proc tohex {a} {\r
-   set r ""\r
-   while 1 {\r
-\r
-      set rem [expr $a%16]\r
-      set a [expr $a/16]\r
-      set r [string index "0123456789abcdef" $rem]$r\r
-      if ($a==0) then break\r
-   }  \r
-   return $r \r
-}\r
-\r
-# encode text\r
-proc encode {a} {\r
-       return [string map {\n <br/> { } {&nbsp;} \t {&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} > &gt; < &lt; / &#47;} $a]\r
-}\r
-\r
-#stubs that can be overriden to save between sessions\r
-proc load_var {a} {\r
-       global glob_var\r
-       catch {\r
-               return $glob_var($a)\r
-       }\r
-       return ""\r
-}\r
-#stubs that can be overriden to save between sessions\r
-proc save_var {a b} {\r
-       catch { \r
-       set glob_var($a) $b\r
-       return ""\r
-       } err\r
-       set glob_var($a) ""\r
-       return ""\r
-}\r
-\r
-\r
-\r
-proc to_textarea {a} {\r
-       return [string map {& &#38; > &gt; < &lt; / &#47;} $a]\r
-}      \r
-\r
-proc from_textarea {a} {\r
-       return [string map {&gt; > &lt; < &#38; & &#47; /} $a]\r
-}\r
-       \r
-proc lunion {a b} {\r
-       foreach e $a {\r
-               set x($e) {}\r
-       }\r
-       foreach e $b {\r
-               if {![info exists x($e)]} {\r
-               lappend a $e\r
-               }\r
-       }\r
-       return $a\r
-}\r
- \r
-\r
-# encode text\r
-proc encode {a} {\r
-       return [string map {\n <br/> { } {&nbsp;} \t {&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} > &gt; < &lt; / &#47;} $a]\r
-}\r
-\r
-# catch any exceptions, capture output and return it \r
-proc capture_catch {a} {\r
-       catch {\r
-               return [eval {capture $a}]\r
-       } result\r
-       return $result\r
-}\r
+# some dummy proc's to get things going for test purposes
+
+
+
+proc ip {} {
+return 10.0.0.55
+}
+
+proc start_chunked {a} {
+       global httpdata
+       global httpmime
+       set httpmime $a
+       set httpdata ""
+}
+
+proc write_chunked {a} {
+       global httpdata
+       append httpdata $a
+}
+
+proc end_chunked {} {
+}
+
+
+
+#proc formfetch {a} {
+#      global httppostdata
+       #catch { 
+#      echo "$a=$httppostdata($a)"
+       #return $httppostdata($a) 
+       #}
+#      
+       #return ""  
+#}
+
+
+
+
+proc tohex {a} {
+   set r ""
+   while 1 {
+
+      set rem [expr $a%16]
+      set a [expr $a/16]
+      set r [string index "0123456789abcdef" $rem]$r
+      if ($a==0) then break
+   }  
+   return $r 
+}
+
+# encode text
+proc encode {a} {
+       return [string map {\n <br/> { } {&nbsp;} \t {&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} > &gt; < &lt; / &#47;} $a]
+}
+
+#stubs that can be overriden to save between sessions
+proc load_var {a} {
+       global glob_var
+       catch {
+               return $glob_var($a)
+       }
+       return ""
+}
+#stubs that can be overriden to save between sessions
+proc save_var {a b} {
+       catch { 
+       set glob_var($a) $b
+       return ""
+       } err
+       set glob_var($a) ""
+       return ""
+}
+
+
+
+proc to_textarea {a} {
+       return [string map {& &#38; > &gt; < &lt; / &#47;} $a]
+}      
+
+proc from_textarea {a} {
+       return [string map {&gt; > &lt; < &#38; & &#47; /} $a]
+}
+       
+proc lunion {a b} {
+       foreach e $a {
+               set x($e) {}
+       }
+       foreach e $b {
+               if {![info exists x($e)]} {
+               lappend a $e
+               }
+       }
+       return $a
+}
+ 
+
+proc first_flash_base {} {
+       set t [lindex 0 [ocd_flash_banks]]
+       return $t(base)
+}