X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fcommand.h;h=07f3c29906ab2f341b4646f4a96bf09f42893a8a;hp=8db1675f84642eb22c1d7f4e2abf6ee7cb7f4d64;hb=9c2468eee40b4b1ca731f15302d6e63b0849aeba;hpb=dc796a209113c3fdc27de0211edcaa67faed7b5f diff --git a/src/helper/command.h b/src/helper/command.h index 8db1675f84..07f3c29906 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * @@ -20,7 +23,18 @@ #ifndef COMMAND_H #define COMMAND_H +#include "types.h" + +/* Integrate the JIM TCL interpretor into the command processing. */ +#if BUILD_ECOSBOARD #include +#include +/* Jim is provied by eCos */ +#include +#else +#define JIM_EMBEDDED +#include "jim.h" +#endif enum command_mode { @@ -35,16 +49,16 @@ typedef struct command_context_s struct command_s *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. */ @@ -59,8 +73,6 @@ typedef struct command_s struct command_s *children; int (*handler)(struct command_context_s *context, char* name, char** args, int argc); enum command_mode mode; - char *help; - int unique_len; struct command_s *next; } command_t; @@ -69,28 +81,27 @@ extern int unregister_command(command_context_t *context, char *name); extern int unregister_all_commands(command_context_t *context); extern void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, const char* line), void *priv); extern command_context_t* copy_command_context(command_context_t* context); -extern command_context_t* command_init(); +extern int command_context_mode(command_context_t *context, enum command_mode mode); +extern command_context_t* command_init(void); extern int command_done(command_context_t *context); extern void command_print(command_context_t *context, char *format, ...); extern void command_print_sameline(command_context_t *context, char *format, ...); extern int command_run_line(command_context_t *context, char *line); extern int command_run_linef(command_context_t *context, char *format, ...); -extern int command_run_line_internal(command_context_t *context, char *line); -extern int command_run_file(command_context_t *context, FILE *file, enum command_mode mode); +extern void command_output_text(command_context_t *context, const char *data); +extern void process_jim_events(void); #define ERROR_COMMAND_CLOSE_CONNECTION (-600) #define ERROR_COMMAND_SYNTAX_ERROR (-601) - +#define ERROR_COMMAND_NOTFOUND (-602) extern int fast_and_dangerous; -#endif /* COMMAND_H */ +extern Jim_Interp *interp; + +void register_jim(command_context_t *context, const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj *const *argv), const char *help); -/* - * Local Variables: ** - * tab-width: 4 ** - * c-basic-offset: 4 ** - * End: ** - */ +long jim_global_long(const char *variable); +#endif /* COMMAND_H */