summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-29 18:27:45 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-30 16:29:34 -0800
commit7b2906de246bc37af99d432b3edf12e9f5f63521 (patch)
tree90fd60bb7ac07e23e61a74a6f67a6ea80d06e7f5 /src/helper
parent8e8a359af2a5ab3cc7c795e147aa0ca3ec06288f (diff)
downloadopenocd+libswd-7b2906de246bc37af99d432b3edf12e9f5f63521.tar.gz
openocd+libswd-7b2906de246bc37af99d432b3edf12e9f5f63521.tar.bz2
openocd+libswd-7b2906de246bc37af99d432b3edf12e9f5f63521.tar.xz
openocd+libswd-7b2906de246bc37af99d432b3edf12e9f5f63521.zip
do not extern 'interp' from command.c
Adds 'interp' field to command_context, chasing the few remaining references to the global variable outside of the command module.
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/command.c2
-rw-r--r--src/helper/command.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index 319f0810..5df4a453 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -1257,7 +1257,7 @@ struct command_context* command_init(const char *startup_tcl)
#if !BUILD_ECOSBOARD
Jim_InitEmbedded();
/* Create an interpreter */
- interp = Jim_CreateInterp();
+ interp = context->interp = Jim_CreateInterp();
/* Add all the Jim core commands */
Jim_RegisterCoreCommands(interp);
#endif
diff --git a/src/helper/command.h b/src/helper/command.h
index 07235961..f27364ea 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -59,6 +59,7 @@ typedef int (*command_output_handler_t)(struct command_context *context,
struct command_context
{
+ Jim_Interp *interp;
enum command_mode mode;
struct command *commands;
int current_target;
@@ -359,8 +360,6 @@ void process_jim_events(void);
#define ERROR_COMMAND_ARGUMENT_OVERFLOW (-604)
#define ERROR_COMMAND_ARGUMENT_UNDERFLOW (-605)
-extern Jim_Interp *interp;
-
int parse_ulong(const char *str, unsigned long *ul);
int parse_ullong(const char *str, unsigned long long *ul);