- fixed arm926 cp15 command bug (thanks to Vincent Palatin for this patch)

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 229fd916e081478fe7165161a6786159cf33cee4..4fbaf467e83f3ce939116c02f161eb09a31d7ee3 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,10 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2006-06-25 13:15 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-03-15 14:30 CET)"
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "log.h"
@@ -32,6 +32,8 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "nand.h"
+#include "pld.h"
 
 #include "command.h"
 #include "server.h"
@@ -40,13 +42,9 @@
 
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
 #include <strings.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
@@ -78,6 +76,8 @@ 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)
                return EXIT_FAILURE;
@@ -97,6 +97,8 @@ int main(int argc, char *argv[])
        
        command_done(cfg_cmd_ctx);
 
+       command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+
        if (jtag_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
        DEBUG("jtag init complete");
@@ -109,6 +111,14 @@ 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");
+
        /* initialize tcp server */
        server_init();
        
@@ -119,6 +129,9 @@ int main(int argc, char *argv[])
        /* handle network connections */
        server_loop(cmd_ctx);
        
+       /* shut server down */
+       server_quit();
+       
        /* free commandline interface */
        command_done(cmd_ctx);