summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2009-12-01 08:42:53 +0100
committerØyvind Harboe <oyvind.harboe@zylin.com>2009-12-01 09:53:23 +0100
commit445da543d8db868466dcef7e23f75b3c2b54bc72 (patch)
tree819361158cd05346790c0cd9d7bdc7340dd97a36
parent5576a6240a103879e1a8d9d4c2b6ff4aee0d23fa (diff)
downloadopenocd+libswd-445da543d8db868466dcef7e23f75b3c2b54bc72.tar.gz
openocd+libswd-445da543d8db868466dcef7e23f75b3c2b54bc72.tar.bz2
openocd+libswd-445da543d8db868466dcef7e23f75b3c2b54bc72.tar.xz
openocd+libswd-445da543d8db868466dcef7e23f75b3c2b54bc72.zip
zy1000: keep up with latest changes to command handling
Keep up with Jim Tcl interpreter creation cleanup. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
-rw-r--r--src/ecosboard.c10
-rw-r--r--src/jtag/zy1000/zy1000.c2
2 files changed, 5 insertions, 7 deletions
diff --git a/src/ecosboard.c b/src/ecosboard.c
index 5588934a..36e807ef 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 115b3be1..07d840fe 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 *