Browse Source

httpd wip

git-svn-id: svn://svn.berlios.de/openocd/trunk@1272 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.1.0
oharboe 13 years ago
parent
commit
fb86d0e76d
6 changed files with 19 additions and 11 deletions
  1. +8
    -2
      src/server/httpd.c
  2. +2
    -0
      src/server/httpd/build.sh
  3. +1
    -1
      src/server/httpd/erase.tcl
  4. +3
    -3
      src/server/httpd/httpd.tcl
  5. +3
    -3
      src/server/httpd/menu.xml
  6. +2
    -2
      src/server/httpd/openocd.tcl

+ 8
- 2
src/server/httpd.c View File

@@ -429,9 +429,14 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection,
}

static struct MHD_Daemon * d;
static pthread_mutex_t mutex;


int httpd_start(void)
{
pthread_mutexattr_t attr;
pthread_mutexattr_init( &attr );
pthread_mutex_init( &mutex, &attr );

int port = 8888;
LOG_USER("Launching httpd server on port %d", port);
@@ -461,15 +466,16 @@ int httpd_start(void)
void httpd_stop(void)
{
MHD_stop_daemon(d);
pthread_mutex_destroy( &mutex );
}

void openocd_sleep_prelude(void)
{
/* FIX!!!! add locking here!!!! */
pthread_mutex_unlock( &mutex );
}

void openocd_sleep_postlude(void)
{
/* FIX!!!! add locking here!!!! */
pthread_mutex_lock( &mutex );
}


+ 2
- 0
src/server/httpd/build.sh View File

@@ -1,3 +1,5 @@
set e
java -classpath ../../../../zy1000/build/xalan.jar\;. Stylizer menu.xsl menu.xml .
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/

+ 1
- 1
src/server/httpd/erase.tcl View File

@@ -161,7 +161,7 @@ append buffer {
set form_length 0x10000
}
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]"
}
}


+ 3
- 3
src/server/httpd/httpd.tcl View File

@@ -102,12 +102,12 @@ proc encode {a} {
# catch any exceptions, capture output and return it
proc capture_catch {a} {
catch {
return [eval {capture $a}]
capture {uplevel $a}
} result
return $result
return $result
}
proc zy1000_flash {} {
proc first_flash_base {} {
set t [lindex 0 [ocd_flash_banks]]
return $t(base)
}

+ 3
- 3
src/server/httpd/menu.xml View File

@@ -438,7 +438,7 @@
set form_length 0x10000
}
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]"
}
}
@@ -794,8 +794,8 @@ append console [encode [capture_catch poll]]
set form_command [formfetch form_command]
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"


+ 2
- 2
src/server/httpd/openocd.tcl View File

@@ -154,8 +154,8 @@ append buffer {
set form_command [formfetch form_command]
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"


Loading…
Cancel
Save