diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-24 10:58:32 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-24 21:37:37 -0800 |
| commit | 8f5ff3ddcf0ab11b0ec6fc9215144154fb0519f9 (patch) | |
| tree | 10e2c2c19ab0aad9cdaf2e6bd551d1f666f2594b /src/openocd.c | |
| parent | 17a9dea53a71e9d7e241262725f3dd707b620d37 (diff) | |
| download | openocd_libswd-8f5ff3ddcf0ab11b0ec6fc9215144154fb0519f9.tar.gz openocd_libswd-8f5ff3ddcf0ab11b0ec6fc9215144154fb0519f9.tar.bz2 openocd_libswd-8f5ff3ddcf0ab11b0ec6fc9215144154fb0519f9.tar.xz openocd_libswd-8f5ff3ddcf0ab11b0ec6fc9215144154fb0519f9.zip | |
httpd: use register_commands()
Updates httpd_start() to use register_commands() for 'readform' and
'writeform' commands. Adds server/httpd.h to export the new signatures
for this function (and httpd_stop), which allows removing the obsoleted
declarations inside openocd.c.
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/openocd.c b/src/openocd.c index 63289e44..e38c84ec 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -41,6 +41,7 @@ #include "telnet_server.h" #include "gdb_server.h" #include "tcl_server.h" +#include "httpd.h" #ifdef HAVE_STRINGS_H #include <strings.h> @@ -216,10 +217,6 @@ struct command_context *setup_command_handler(void) return cmd_ctx; } -int httpd_start(void); -void httpd_stop(void); - - #if !BUILD_HTTPD && !BUILD_ECOSBOARD /* implementations of OpenOCD that uses multithreading needs to know when * OpenOCD is sleeping. No-op in vanilla OpenOCD @@ -269,7 +266,7 @@ int openocd_main(int argc, char *argv[]) return EXIT_FAILURE; #if BUILD_HTTPD - if (httpd_start() != ERROR_OK) + if (httpd_start(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; #endif |