summaryrefslogtreecommitdiff
path: root/cleopatre/tools/openocd-r668/src/openocd.c
diff options
context:
space:
mode:
authorsave2009-05-14 09:12:10 +0000
committersave2009-05-14 09:12:10 +0000
commit0c66f103ec4cc0533a56dbd2797bbfc44e34e330 (patch)
tree4124d11af56e265e0e3f202d6541e1f2d3b706c8 /cleopatre/tools/openocd-r668/src/openocd.c
parent37764821fe4bf778dbd3e9142c02c2ad0c4543a6 (diff)
[CLEO][OPENOCD]Apply different patches for log level, 8bits flashs and spi flashs
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@4649 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/tools/openocd-r668/src/openocd.c')
-rw-r--r--cleopatre/tools/openocd-r668/src/openocd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cleopatre/tools/openocd-r668/src/openocd.c b/cleopatre/tools/openocd-r668/src/openocd.c
index 30625bae12..8f6129bb75 100644
--- a/cleopatre/tools/openocd-r668/src/openocd.c
+++ b/cleopatre/tools/openocd-r668/src/openocd.c
@@ -93,6 +93,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
initialized=1;
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+ command_set_output_handler_err(cmd_ctx, configuration_output_handler_err, NULL);
atexit(exit_handler);
@@ -183,7 +184,7 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
LOG_DEBUG("log init complete");
- LOG_OUTPUT( OPENOCD_VERSION "\n" );
+// LOG_OUTPUT( OPENOCD_VERSION "\n" );
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
@@ -191,7 +192,7 @@ int main(int argc, char *argv[])
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
- LOG_OUTPUT( "$URL: http://svn.berlios.de/svnroot/repos/openocd/trunk/src/openocd.c $\n");
+// LOG_OUTPUT( "$URL: http://svn.berlios.de/svnroot/repos/openocd/trunk/src/openocd.c $\n");
/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
@@ -204,6 +205,7 @@ int main(int argc, char *argv[])
cfg_cmd_ctx = copy_command_context(cmd_ctx);
cfg_cmd_ctx->mode = COMMAND_CONFIG;
command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);
+ command_set_output_handler_err(cfg_cmd_ctx, configuration_output_handler_err, NULL);
if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
return EXIT_FAILURE;