Pavel Chromy, the patch fixes an issue with PRESTO & FTD2XX under Linux.

[openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index b20ffd23c83f732f44fa385fca0e3d6621ddae90..fac385a1f11b6fbf3126428e8826abc5a9f8cf4b 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2007-07-26 11:30 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -60,7 +60,8 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
 void exit_handler(void)
 {
        /* close JTAG interface */
-       if (jtag && jtag->quit) jtag->quit();
+       if (jtag && jtag->quit)
+               jtag->quit();
 }
 
 int main(int argc, char *argv[])
@@ -71,7 +72,7 @@ int main(int argc, char *argv[])
 
        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);
@@ -89,7 +90,8 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        DEBUG("log init complete");
        
-       INFO( OPENOCD_VERSION );
+       OUTPUT( OPENOCD_VERSION "\n" );
+       OUTPUT( "$URL$\n");
 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -115,7 +117,7 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        DEBUG("target init complete");
 
-       if (flash_init(cmd_ctx) != ERROR_OK)
+       if (flash_init_drivers(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
        DEBUG("flash init complete");
 
@@ -129,19 +131,25 @@ int main(int argc, char *argv[])
 
        /* initialize tcp server */
        server_init();
-       
+
        /* initialize telnet subsystem */
        telnet_init("Open On-Chip Debugger");
        gdb_init();
 
+       /* call any target resets */
+       if (target_init_reset(cmd_ctx) != ERROR_OK)
+               return EXIT_FAILURE;
+       DEBUG("target init reset complete");
+
        /* handle network connections */
        server_loop(cmd_ctx);
-       
+
        /* shut server down */
        server_quit();
-       
+
        /* free commandline interface */
        command_done(cmd_ctx);
-       
+
        return EXIT_SUCCESS;
 }
+