- added a test document as a starting point

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 26a218b9d1ac6384d7d97d1e66660120da232e77..b636d06d388f7f9aab5cba16f620a7517f309090 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-08-25 12:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -90,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$");\r
 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -116,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");
 
@@ -134,7 +138,12 @@ int main(int argc, char *argv[])
        /* 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);