From 225ac18450830ff130e2d14a1bbceebb758a399d Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 7 Jul 2008 20:02:51 +0000
Subject: [PATCH] more tcl cleanup.
git-svn-id: svn://svn.berlios.de/openocd/trunk@768 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/openocd.c | 8 ++++----
src/tcl/commands.tcl | 5 -----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/openocd.c b/src/openocd.c
index 834b11d92..6bf163f5b 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -381,10 +381,6 @@ static void tcl_output(void *privData, const char *file, int line, const char *f
int jim_command(command_context_t *context, char *line)
{
int retval=ERROR_OK;
- /* FIX!!!! in reality there is only one cmd_ctx handler, but consider
- what might happen here if there are multiple handlers w/reentrant callback
- fn's... shudder! */
- active_cmd_ctx=context;
int retcode=Jim_Eval(interp, line);
const char *result;
@@ -685,6 +681,8 @@ int openocd_main(int argc, char *argv[])
cfg_cmd_ctx->mode = COMMAND_CONFIG;
command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);
+ active_cmd_ctx=cfg_cmd_ctx;
+
if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
return EXIT_FAILURE;
@@ -693,6 +691,8 @@ int openocd_main(int argc, char *argv[])
if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
+ active_cmd_ctx=cmd_ctx;
+
command_done(cfg_cmd_ctx);
if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
diff --git a/src/tcl/commands.tcl b/src/tcl/commands.tcl
index a272c1342..a2cf0812d 100644
--- a/src/tcl/commands.tcl
+++ b/src/tcl/commands.tcl
@@ -1,9 +1,4 @@
-# implements Tcl procedures/functions
-proc peek {address} {
- return [openocd_throw "mdw $address"]
-}
-
# Production command
# FIX!!! need to figure out how to feed back relevant output
# from e.g. "flash banks" command...
--
GitLab