diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-06 19:17:43 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-06 19:17:43 +0000 |
commit | dc796a209113c3fdc27de0211edcaa67faed7b5f (patch) | |
tree | ea4090346c30947e3b688338b886e40ffdfd49d0 /src/helper | |
parent | 71460ba9a59503bdf7780962b93143021d423958 (diff) | |
download | openocd+libswd-dc796a209113c3fdc27de0211edcaa67faed7b5f.tar.gz openocd+libswd-dc796a209113c3fdc27de0211edcaa67faed7b5f.tar.bz2 openocd+libswd-dc796a209113c3fdc27de0211edcaa67faed7b5f.tar.xz openocd+libswd-dc796a209113c3fdc27de0211edcaa67faed7b5f.zip |
src/helper/configuration.h
- Log output handlers now get a "const char *line"
- Added "const" to parameter.
src/helper/command.c
src/helper/command.h
- New function: 'command_output_text()'
- Log output handlers now get a "const char *line"
src/helper/options.c
- Log output handlers now get a "const char *line"
src/server/telnet_server.c
- DO not transmit NULL bytes via TELNET.
- Log output handlers now get a "const char *line"
src/server/gdb_server.c
- Log output handlers now get a "const char *line"
*** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent
previously to the mailing list for TCL users try
src/target/target.c
*** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent
previously to the mailing list for TCL users try
src/target/target.h
*** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent
previously to the mailing list for TCL users try
src/openocd.c
- **MAJOR** Work: New TCL/Jim function: mem2array
- **MAJOR** Work: Redirect Tcl/Jim stdio output to remote users.
- Previously: TCL output did not go to GDB.
- Previously: TCL output did not go to TELNET
- Previously: TCL output only goes to control console.
- This fixes that problem.
+ Created callbacks:
+openocd_jim_fwrite()
+openocd_jim_fread()
+openocd_jim_vfprintf()
+openocd_jim_fflush()
+openocd_jim_fgets()
src/Makefile.am
- New TCL files.
- Future note: This should be more automated. As the list of
'tcl' files grows maintaning this list will suck.
src/Jim.c
- ** THIS INCLUDES A PREVIOUS PATCH I SENT EARLIER **
- that impliments many [format] specifies JIM did not support.
- Jim_FormatString() - **MAJOR** work.
- Previously only supported "%s" "%d" and "%c"
- And what support existed had bugs.
- NEW: *MANY* formating parameters are now supported.
- TODO: The "precision" specifier is not supported.
** NEW ** This patch.
- Jim_StringToWide() test if no conversion occured.
- Jim_StringToIndex() test if no conversion occured.
- Jim_StringToDouble() test if no conversion occured.
** NEW ** This Patch. Major Work.
- Previously output from JIM did not get sent to GDB
- Ditto: Output to Telnet session.
- Above items are now fixed - By introducing callbacks
new function pointers in the "interp" structure.
- Helpers that call the callbacks.
- New function: Jim_fprintf()
- New function: Jim_vfprintf()
- New function: Jim_fwrite()
- New function: Jim_fread()
- New function: Jim_fflush()
- New function: Jim_fgets()
By default: the output is to STDIO as previous.
The "openocd.c" - redirects the output as needed.
- Jim_Panic() - Send panic to both STDERR and the interps
specified STDERR output as a 2nd choice.
- Now JIM's "stdin/stdout/stderr" paramters are "void *"
and are no longer "FILE *".
src/Jim.h
- **MAJOR**
- New JIM STDIO callbacks in the "interp" structure.
- change: "stdin/stdout/stderr" are now "void *" cookies.
- New JIM stdio helper functions.
git-svn-id: svn://svn.berlios.de/openocd/trunk@755 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r-- | src/helper/command.c | 9 | ||||
-rw-r--r-- | src/helper/command.h | 12 | ||||
-rw-r--r-- | src/helper/configuration.h | 2 | ||||
-rw-r--r-- | src/helper/options.c | 2 |
4 files changed, 20 insertions, 5 deletions
diff --git a/src/helper/command.c b/src/helper/command.c index ed0a82e6..386572ed 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -621,7 +621,7 @@ int command_print_help(command_context_t* context, char* name, char** args, int return command_print_help_match(context, context->commands, name, args, argc); } -void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, char* line), void *priv) +void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, const char* line), void *priv) { context->output_handler = output_handler; context->output_handler_priv = priv; @@ -720,3 +720,10 @@ int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **arg return retval; } +/* + * Local Variables: ** + * tab-width: 4 ** + * c-basic-offset: 4 ** + * End: ** + */ + diff --git a/src/helper/command.h b/src/helper/command.h index 8d50d6e6..8db1675f 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -48,7 +48,7 @@ typedef struct command_context_s * Returning ERROR_COMMAND_SYNTAX_ERROR will have the effect of * printing out the syntax of the command. */ - int (*output_handler)(struct command_context_s *context, char* line); + int (*output_handler)(struct command_context_s *context, const char* line); void *output_handler_priv; } command_context_t; @@ -67,7 +67,7 @@ typedef struct command_s extern command_t* register_command(command_context_t *context, command_t *parent, char *name, int (*handler)(struct command_context_s *context, char* name, char** args, int argc), enum command_mode mode, char *help); 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, char* line), void *priv); +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_done(command_context_t *context); @@ -86,3 +86,11 @@ extern int command_run_file(command_context_t *context, FILE *file, enum command extern int fast_and_dangerous; #endif /* COMMAND_H */ + +/* + * Local Variables: ** + * tab-width: 4 ** + * c-basic-offset: 4 ** + * End: ** + */ + diff --git a/src/helper/configuration.h b/src/helper/configuration.h index 894d874c..1d315cc2 100644 --- a/src/helper/configuration.h +++ b/src/helper/configuration.h @@ -27,7 +27,7 @@ extern int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char extern int parse_config_file(struct command_context_s *cmd_ctx); extern void add_config_command (const char *cfg); extern void add_script_search_dir (const char *dir); -extern int configuration_output_handler(struct command_context_s *context, char* line); +extern int configuration_output_handler(struct command_context_s *context, const char* line); extern FILE *open_file_from_path (char *file, char *mode); extern char *find_file(char *name); diff --git a/src/helper/options.c b/src/helper/options.c index ab36a286..afff55ba 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -45,7 +45,7 @@ static struct option long_options[] = {0, 0, 0, 0} }; -int configuration_output_handler(struct command_context_s *context, char* line) +int configuration_output_handler(struct command_context_s *context, const char* line) { LOG_INFO_N(line); |