Keep up with Jim Tcl interpreter creation cleanup.
Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>
---
src/ecosboard.c | 10 ++++------
src/jtag/zy1000/zy1000.c | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/ecosboard.c b/src/ecosboard.c
index 5588934..36e807e 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -80,6 +80,7 @@
#include <unistd.h>
#include <stdio.h>
+#include <openocd.h>
#ifdef CYGPKG_HAL_NIOS2
#define ZY1000_SER_DEV "/dev/uart_0"
@@ -505,8 +506,6 @@ static void zylinjtag_startNetwork(void)
cyg_httpd_init_tcl_interpreter();
- interp = httpstate.jim_interp;
-
Jim_CreateCommand(httpstate.jim_interp, "log",
zylinjtag_Jim_Command_log,
NULL, NULL);
Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
@@ -933,8 +932,6 @@ bool logAllToSerial = false;
int boolParam(char *var);
-struct command_context *setup_command_handler(void);
-
static const char *zylin_config_dir="/config/settings";
static int add_default_dirs(void)
@@ -1078,7 +1075,8 @@ int main(int argc, char *argv[])
/* initialize commandline interface */
struct command_context * cmd_ctx;
- cmd_ctx = setup_command_handler();
+ struct command_context *setup_command_handler(Jim_Interp *interp);
+ cmd_ctx = setup_command_handler(httpstate.jim_interp);
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
command_context_mode(cmd_ctx, COMMAND_CONFIG);
@@ -1095,7 +1093,7 @@ int main(int argc, char *argv[])
COMMAND_ANY, NULL);
#endif
- Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL,
NULL);
+ Jim_CreateCommand(httpstate.jim_interp, "uart",
zylinjtag_Jim_Command_uart, NULL, NULL);
log_init();
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 115b3be..07d840f 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007-2008 by Øyvind Harboe *
+ * Copyright (C) 2007-2009 by Øyvind Harboe *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
--
1.6.3.3
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
