git-svn-id: svn://svn.berlios.de/openocd/trunk@1272 b42882b7-edfa-0310-969c-e2dbd0fdcd60tags/v0.1.0
@@ -429,9 +429,14 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection, | |||||
} | } | ||||
static struct MHD_Daemon * d; | static struct MHD_Daemon * d; | ||||
static pthread_mutex_t mutex; | |||||
int httpd_start(void) | int httpd_start(void) | ||||
{ | { | ||||
pthread_mutexattr_t attr; | |||||
pthread_mutexattr_init( &attr ); | |||||
pthread_mutex_init( &mutex, &attr ); | |||||
int port = 8888; | int port = 8888; | ||||
LOG_USER("Launching httpd server on port %d", port); | LOG_USER("Launching httpd server on port %d", port); | ||||
@@ -461,15 +466,16 @@ int httpd_start(void) | |||||
void httpd_stop(void) | void httpd_stop(void) | ||||
{ | { | ||||
MHD_stop_daemon(d); | MHD_stop_daemon(d); | ||||
pthread_mutex_destroy( &mutex ); | |||||
} | } | ||||
void openocd_sleep_prelude(void) | void openocd_sleep_prelude(void) | ||||
{ | { | ||||
/* FIX!!!! add locking here!!!! */ | |||||
pthread_mutex_unlock( &mutex ); | |||||
} | } | ||||
void openocd_sleep_postlude(void) | void openocd_sleep_postlude(void) | ||||
{ | { | ||||
/* FIX!!!! add locking here!!!! */ | |||||
pthread_mutex_lock( &mutex ); | |||||
} | } | ||||
@@ -1,3 +1,5 @@ | |||||
set e | set e | ||||
java -classpath ../../../../zy1000/build/xalan.jar\;. Stylizer menu.xsl menu.xml . | java -classpath ../../../../zy1000/build/xalan.jar\;. Stylizer menu.xsl menu.xml . | ||||
find . -regex ".*\.tcl" -type f -exec sh html2tcl.sh {} {} \; | find . -regex ".*\.tcl" -type f -exec sh html2tcl.sh {} {} \; | ||||
echo "Copy .tcl files to /usr/local/lib/openocd/httpd/" | |||||
cp *.tcl /usr/local/lib/openocd/httpd/ |
@@ -161,7 +161,7 @@ append buffer { | |||||
set form_length 0x10000 | set form_length 0x10000 | ||||
} | } | ||||
if {[string compare $form_address ""]==0} { | if {[string compare $form_address ""]==0} { | ||||
if {[catch {[zy1000_flash]} result]==0} { | |||||
if {[catch {[first_flash_base]} result]==0} { | |||||
set form_address "0x[tohex $result]" | set form_address "0x[tohex $result]" | ||||
} | } | ||||
} | } | ||||
@@ -102,12 +102,12 @@ proc encode {a} { | |||||
# catch any exceptions, capture output and return it | # catch any exceptions, capture output and return it | ||||
proc capture_catch {a} { | proc capture_catch {a} { | ||||
catch { | catch { | ||||
return [eval {capture $a}] | |||||
capture {uplevel $a} | |||||
} result | } result | ||||
return $result | |||||
return $result | |||||
} | } | ||||
proc zy1000_flash {} { | |||||
proc first_flash_base {} { | |||||
set t [lindex 0 [ocd_flash_banks]] | set t [lindex 0 [ocd_flash_banks]] | ||||
return $t(base) | return $t(base) | ||||
} | } |
@@ -438,7 +438,7 @@ | |||||
set form_length 0x10000 | set form_length 0x10000 | ||||
} | } | ||||
if {[string compare $form_address ""]==0} { | if {[string compare $form_address ""]==0} { | ||||
if {[catch {[zy1000_flash]} result]==0} { | |||||
if {[catch {[first_flash_base]} result]==0} { | |||||
set form_address "0x[tohex $result]" | set form_address "0x[tohex $result]" | ||||
} | } | ||||
} | } | ||||
@@ -794,8 +794,8 @@ append console [encode [capture_catch poll]] | |||||
set form_command [formfetch form_command] | set form_command [formfetch form_command] | ||||
set form_edittext "" | set form_edittext "" | ||||
if {[string length $form_command]>0} { | |||||
catch {capture_catch {eval "$form_command"}} form_edittext | |||||
if {[string length $form_command]>0} { | |||||
set form_edittext [capture_catch {eval $form_command}] | |||||
} | } | ||||
append buffer {<form action="openocd.tcl" method="post">} "\n" | append buffer {<form action="openocd.tcl" method="post">} "\n" | ||||
@@ -154,8 +154,8 @@ append buffer { | |||||
set form_command [formfetch form_command] | set form_command [formfetch form_command] | ||||
set form_edittext "" | set form_edittext "" | ||||
if {[string length $form_command]>0} { | |||||
catch {capture_catch {eval "$form_command"}} form_edittext | |||||
if {[string length $form_command]>0} { | |||||
set form_edittext [capture_catch {eval $form_command}] | |||||
} | } | ||||
append buffer {<form action="openocd.tcl" method="post">} "\n" | append buffer {<form action="openocd.tcl" method="post">} "\n" | ||||