- slight mips32 cleanup/reformat

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 6adbbc6198227bb2a680df1509690937cfb5cf2c..51e40537781e5e35b9d012519b0f6570c7903b51 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -39,6 +39,7 @@
 #include "flash.h"
 #include "nand.h"
 #include "pld.h"
+#include "mflash.h"
 
 #include "command.h"
 #include "server.h"
@@ -63,12 +64,7 @@
 
 #include "replacements.h"
 
-
-
-
-
-
-void print_version()
+void print_version(void)
 {
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
@@ -110,8 +106,18 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 {
        switch (event)
        {
+               case TARGET_EVENT_GDB_START:
+                       target->display=0;
+                       break;
+               case TARGET_EVENT_GDB_END:
+                       target->display=1;
+                       break;
                case TARGET_EVENT_HALTED:
-                       target_arch_state(target);
+                       if (target->display)
+                       {
+                               /* do not display information when debugger caused the halt */
+                               target_arch_state(target);
+                       }
                        break;
                default:
                        break;
@@ -127,11 +133,11 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        static int initialized=0;
        if (initialized)
                return ERROR_OK;
-       
+
        initialized=1;
-       
+
        atexit(exit_handler);
-       
+
        if (target_init(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("target init complete");
@@ -153,11 +159,15 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                        LOG_DEBUG("jtag examine complete");
                }
        }
-       
+
        if (flash_init_drivers(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("flash init complete");
 
+       if (mflash_init_drivers(cmd_ctx) != ERROR_OK)
+               return ERROR_FAIL;
+       LOG_DEBUG("mflash init complete");
+
        if (nand_init(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("NAND init complete");
@@ -175,7 +185,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        tcl_init(); /* allows tcl to just connect without going thru telnet */
 
        target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
-       
+
        return ERROR_OK;
 }
 
@@ -184,12 +194,12 @@ command_context_t *global_cmd_ctx;
 command_context_t *setup_command_handler(void)
 {
        command_context_t *cmd_ctx;
-       
+
        global_cmd_ctx = cmd_ctx = command_init();
-       
+
        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);
@@ -202,7 +212,8 @@ command_context_t *setup_command_handler(void)
        flash_register_commands(cmd_ctx);
        nand_register_commands(cmd_ctx);
        pld_register_commands(cmd_ctx);
-       
+       mflash_register_commands(cmd_ctx);
+
        if (log_init(cmd_ctx) != ERROR_OK)
        {
                exit(-1);
@@ -210,7 +221,7 @@ command_context_t *setup_command_handler(void)
        LOG_DEBUG("log init complete");
 
        LOG_OUTPUT( OPENOCD_VERSION "\n" );
-       
+
        register_command(cmd_ctx, NULL, "init", handle_init_command,
                                         COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
 
@@ -228,27 +239,27 @@ int openocd_main(int argc, char *argv[])
        command_context_t *cmd_ctx;
 
        cmd_ctx = setup_command_handler();
-       
+
        LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
        print_version();
-       
+
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
        if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;
-       
+
        ret = parse_config_file(cmd_ctx);
        if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
                return EXIT_FAILURE;
 
-       if (ret != ERROR_COMMAND_CLOSE_CONNECTION) 
+       if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
        {
                command_context_mode(cmd_ctx, COMMAND_EXEC);
                if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
                        return EXIT_FAILURE;
-       
+
                /* handle network connections */
                server_loop(cmd_ctx);
        }
@@ -257,7 +268,7 @@ int openocd_main(int argc, char *argv[])
        server_quit();
 
        unregister_all_commands(cmd_ctx);
-       
+
        /* free commandline interface */
        command_done(cmd_ctx);