X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fopenocd.c;h=51e40537781e5e35b9d012519b0f6570c7903b51;hb=71c73068858ad80020c7956a215a5ec590704ddb;hp=67d890ecd0d883b2a6d594e09de5667285bae28e;hpb=09bb073239279be4df77a40377da66a741f43c5c;p=fw%2Fopenocd diff --git a/src/openocd.c b/src/openocd.c index 67d890ecd..51e405377 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 Richard Missenden * + * richard.missenden@googlemail.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 * @@ -33,6 +39,7 @@ #include "flash.h" #include "nand.h" #include "pld.h" +#include "mflash.h" #include "command.h" #include "server.h" @@ -57,6 +64,28 @@ #include "replacements.h" +void print_version(void) +{ + /* 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 */ + /* 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$\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 */ + /* 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 */ +} + + + + + + + + /* Give TELNET a way to find out what version this is */ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) @@ -66,7 +95,6 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char ** return ERROR_OK; } - void exit_handler(void) { /* close JTAG interface */ @@ -78,8 +106,18 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe { switch (event) { + case TARGET_EVENT_GDB_START: + target->display=0; + break; + case TARGET_EVENT_GDB_END: + target->display=1; + break; case TARGET_EVENT_HALTED: - target_arch_state(target); + if (target->display) + { + /* do not display information when debugger caused the halt */ + target_arch_state(target); + } break; default: break; @@ -88,8 +126,6 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe return ERROR_OK; } - - /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { @@ -97,11 +133,11 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg static int initialized=0; if (initialized) return ERROR_OK; - + initialized=1; - + atexit(exit_handler); - + if (target_init(cmd_ctx) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("target init complete"); @@ -118,16 +154,20 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg if (jtag_init(cmd_ctx) == ERROR_OK) { LOG_DEBUG("jtag init complete"); - if (target_examine(cmd_ctx) == ERROR_OK) + if (target_examine() == ERROR_OK) { LOG_DEBUG("jtag examine complete"); } } - + if (flash_init_drivers(cmd_ctx) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("flash init complete"); + if (mflash_init_drivers(cmd_ctx) != ERROR_OK) + return ERROR_FAIL; + LOG_DEBUG("mflash init complete"); + if (nand_init(cmd_ctx) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("NAND init complete"); @@ -146,8 +186,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg target_register_event_callback(log_target_callback_event_handler, cmd_ctx); - - return ERROR_OK; } @@ -156,12 +194,12 @@ command_context_t *global_cmd_ctx; command_context_t *setup_command_handler(void) { command_context_t *cmd_ctx; - + global_cmd_ctx = cmd_ctx = command_init(); - + register_command(cmd_ctx, NULL, "version", handle_version_command, COMMAND_EXEC, "show OpenOCD version"); - + /* register subsystem commands */ server_register_commands(cmd_ctx); telnet_register_commands(cmd_ctx); @@ -174,7 +212,8 @@ command_context_t *setup_command_handler(void) flash_register_commands(cmd_ctx); nand_register_commands(cmd_ctx); pld_register_commands(cmd_ctx); - + mflash_register_commands(cmd_ctx); + if (log_init(cmd_ctx) != ERROR_OK) { exit(-1); @@ -182,7 +221,7 @@ command_context_t *setup_command_handler(void) LOG_DEBUG("log init complete"); LOG_OUTPUT( OPENOCD_VERSION "\n" ); - + register_command(cmd_ctx, NULL, "init", handle_init_command, COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); @@ -194,44 +233,42 @@ command_context_t *setup_command_handler(void) * application will have it's own implementation of main(). */ int openocd_main(int argc, char *argv[]) { + int ret; + /* initialize commandline interface */ command_context_t *cmd_ctx; cmd_ctx = setup_command_handler(); - /* 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 */ - /* 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$\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 */ - /* 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 */ + LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n"); + + print_version(); command_context_mode(cmd_ctx, COMMAND_CONFIG); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK) return EXIT_FAILURE; - - if (parse_config_file(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - command_context_mode(cmd_ctx, COMMAND_EXEC); - if (command_run_line(cmd_ctx, "init")!=ERROR_OK) + ret = parse_config_file(cmd_ctx); + if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) ) return EXIT_FAILURE; - - /* handle network connections */ - server_loop(cmd_ctx); + + if (ret != ERROR_COMMAND_CLOSE_CONNECTION) + { + command_context_mode(cmd_ctx, COMMAND_EXEC); + if (command_run_line(cmd_ctx, "init")!=ERROR_OK) + return EXIT_FAILURE; + + /* handle network connections */ + server_loop(cmd_ctx); + } /* shut server down */ server_quit(); unregister_all_commands(cmd_ctx); - + /* free commandline interface */ command_done(cmd_ctx);