- jtag minidriver work in progress

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1bdbb1cac3e9bc25cc3b661a3ddf5866070eb932..d362c6490ab4c2e8d46cd6768d83f005834df0c3 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-31 12:00 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,11 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        DEBUG("log init complete");
        
-       INFO( OPENOCD_VERSION );
+       printf( OPENOCD_VERSION );
+       printf( "\n$URL$\n");
+  
+       DEBUG( OPENOCD_VERSION );
+       DEBUG( "$URL$");
 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -115,7 +120,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 +134,24 @@ 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;
 }