summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-17 09:15:09 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-18 07:22:22 -0800
commit5e229bbf87fbb5a809553526edf0186dd3dd5cf8 (patch)
tree4abbfa0e0deeccbd2ae0052df247d8743548496d /src/helper
parentcb7dbc1af41068f826246beb53870c01d8973bb8 (diff)
downloadopenocd+libswd-5e229bbf87fbb5a809553526edf0186dd3dd5cf8.tar.gz
openocd+libswd-5e229bbf87fbb5a809553526edf0186dd3dd5cf8.tar.bz2
openocd+libswd-5e229bbf87fbb5a809553526edf0186dd3dd5cf8.tar.xz
openocd+libswd-5e229bbf87fbb5a809553526edf0186dd3dd5cf8.zip
pass startup_tcl to command_init
Removes external linkage from helper module, making the startup code a parameter to a new command context's initialization routine.
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/command.c3
-rw-r--r--src/helper/command.h5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index ad09e3de..708a8024 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -766,10 +766,9 @@ COMMAND_HANDLER(handle_fast_command)
}
-struct command_context* command_init()
+struct command_context* command_init(const char *startup_tcl)
{
struct command_context* context = malloc(sizeof(struct command_context));
- extern const char startup_tcl[];
const char *HostOs;
context->mode = COMMAND_EXEC;
diff --git a/src/helper/command.h b/src/helper/command.h
index 62231fc8..05088b56 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -190,7 +190,10 @@ struct command_context* copy_command_context(struct command_context* context);
int command_context_mode(struct command_context *context, enum command_mode mode);
-struct command_context* command_init(void);
+/**
+ * Creates a new command context using the startup TCL provided.
+ */
+struct command_context* command_init(const char *startup_tcl);
int command_done(struct command_context *context);
void command_print(struct command_context *context, const char *format, ...)