command output capture: do not use interp global

[openocd.git] / src / helper / command.h

diff --git a/src/helper/command.h b/src/helper/command.h
index 72c5647567dbb01d29349649da7924677633b298..f27364eaf6de2b2aaa80a7657ff569ee4b134b1a 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -59,23 +59,10 @@ 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;
-       /* Execute a command.
-        *
-        * If the command fails, it *MUST* return a value != ERROR_OK
-        * (many commands break this rule, patches welcome!)
-        *
-        * This is *especially* important for commands such as writing
-        * to flash or verifying memory. The reason is that those commands
-        * can be used by programs to determine if the operation succeded
-        * or not. If the operation failed, then a program can try
-        * an alternative approach.
-        *
-        * Returning ERROR_COMMAND_SYNTAX_ERROR will have the effect of
-        * printing out the syntax of the command.
-        */
        command_output_handler_t output_handler;
        void *output_handler_priv;
 };
@@ -166,7 +153,23 @@ struct command_invocation {
 #define CMD_DATA CMD_CURRENT->jim_handler_data
 
 
-/// The type signature for commands' handler functions.
+/**
+ * The type signature for command handling functions.  They are
+ * usually registered as part of command_registration, providing
+ * a high-level means for executing a command.
+ *
+ * If the command fails, it *MUST* return a value != ERROR_OK
+ * (many commands break this rule, patches welcome!)
+ *
+ * This is *especially* important for commands such as writing
+ * to flash or verifying memory. The reason is that those commands
+ * can be used by programs to determine if the operation succeded
+ * or not. If the operation failed, then a program can try
+ * an alternative approach.
+ *
+ * Returning ERROR_COMMAND_SYNTAX_ERROR will have the effect of
+ * printing out the syntax of the command.
+ */
 typedef __COMMAND_HANDLER((*command_handler_t));
 
 struct command
@@ -357,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);