Changed openocd version info creation to be more useful.

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1e8ceea34c6b3e28b11b61181c9cc117740652a9..264823a40665dc57473ddc73d3fff220986b1473 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 (2006-01-25 11:30 CET)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +32,7 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "nand.h"
 #include "pld.h"
 
 #include "command.h"
@@ -56,6 +57,13 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
        return ERROR_OK;
 }
 
+void exit_handler(void)
+{
+       /* close JTAG interface */
+       if (jtag && jtag->quit)
+               jtag->quit();
+}
+
 int main(int argc, char *argv[])
 {
        /* initialize commandline interface */
@@ -75,6 +83,7 @@ int main(int argc, char *argv[])
        xsvf_register_commands(cmd_ctx);
        target_register_commands(cmd_ctx);
        flash_register_commands(cmd_ctx);
+       nand_register_commands(cmd_ctx);
        pld_register_commands(cmd_ctx);
        
        if (log_init(cmd_ctx) != ERROR_OK)
@@ -82,6 +91,7 @@ int main(int argc, char *argv[])
        DEBUG("log init complete");
        
        INFO( OPENOCD_VERSION );
+       INFO( "$URL: $");
 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -97,6 +107,8 @@ int main(int argc, char *argv[])
 
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
+       atexit(exit_handler);
+
        if (jtag_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
        DEBUG("jtag init complete");
@@ -109,6 +121,10 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        DEBUG("flash init complete");
 
+       if (nand_init(cmd_ctx) != ERROR_OK)
+               return EXIT_FAILURE;
+       DEBUG("NAND init complete");
+
        if (pld_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
        DEBUG("pld init complete");