Pavel Chromy

- multiple log listeners
- added OUTPUT() to replace printf
- fix formatting

git-svn-id: svn://svn.berlios.de/openocd/trunk@346 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 156 insertions, 156 deletions

diff --git a/src/openocd.c b/src/openocd.c
index b636d06d..c2f87764 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -1,157 +1,157 @@
-/***************************************************************************
- *   Copyright (C) 2005 by Dominic Rath                                    *
- *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "log.h"
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
-#include "interpreter.h"
-#include "xsvf.h"
-#include "target.h"
-#include "flash.h"
-#include "nand.h"
-#include "pld.h"
-
-#include "command.h"
-#include "server.h"
-#include "telnet_server.h"
-#include "gdb_server.h"
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-/* Give TELNET a way to find out what version this is */
-int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-	command_print(cmd_ctx, OPENOCD_VERSION);
-
-	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 */
-	command_context_t *cmd_ctx, *cfg_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);
-	gdb_register_commands(cmd_ctx);
-	log_register_commands(cmd_ctx);
-	jtag_register_commands(cmd_ctx);
-	interpreter_register_commands(cmd_ctx);
-	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;
-	DEBUG("log init complete");
-	
-	printf( OPENOCD_VERSION );
-	printf( "\n$URL$\n");
-  
-	DEBUG( OPENOCD_VERSION );
+/***************************************************************************

+ *   Copyright (C) 2005 by Dominic Rath                                    *

+ *   Dominic.Rath@gmx.de                                                   *

+ *                                                                         *

+ *   This program is free software; you can redistribute it and/or modify  *

+ *   it under the terms of the GNU General Public License as published by  *

+ *   the Free Software Foundation; either version 2 of the License, or     *

+ *   (at your option) any later version.                                   *

+ *                                                                         *

+ *   This program is distributed in the hope that it will be useful,       *

+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *

+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *

+ *   GNU General Public License for more details.                          *

+ *                                                                         *

+ *   You should have received a copy of the GNU General Public License     *

+ *   along with this program; if not, write to the                         *

+ *   Free Software Foundation, Inc.,                                       *

+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *

+ ***************************************************************************/

+

+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV

+

+#ifdef HAVE_CONFIG_H

+#include "config.h"

+#endif

+

+#include "log.h"

+#include "types.h"

+#include "jtag.h"

+#include "configuration.h"

+#include "interpreter.h"

+#include "xsvf.h"

+#include "target.h"

+#include "flash.h"

+#include "nand.h"

+#include "pld.h"

+

+#include "command.h"

+#include "server.h"

+#include "telnet_server.h"

+#include "gdb_server.h"

+

+#include <sys/time.h>

+#include <sys/types.h>

+#include <strings.h>

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+#include <unistd.h>

+#include <errno.h>

+

+/* Give TELNET a way to find out what version this is */

+int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)

+{

+	command_print(cmd_ctx, OPENOCD_VERSION);

+

+	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 */

+	command_context_t *cmd_ctx, *cfg_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);

+	gdb_register_commands(cmd_ctx);

+	log_register_commands(cmd_ctx);

+	jtag_register_commands(cmd_ctx);

+	interpreter_register_commands(cmd_ctx);

+	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;

+	DEBUG("log init complete");

+	

+	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;
-	command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);
-	
-	if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
-		return EXIT_FAILURE;
-
-	if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)
-		return EXIT_FAILURE;
-	
-	command_done(cfg_cmd_ctx);
-
-	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");
-
-	if (target_init(cmd_ctx) != ERROR_OK)
-		return EXIT_FAILURE;
-	DEBUG("target init complete");
-
-	if (flash_init_drivers(cmd_ctx) != ERROR_OK)
-		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();
-	
-	/* 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;
-}
+

+	cfg_cmd_ctx = copy_command_context(cmd_ctx);

+	cfg_cmd_ctx->mode = COMMAND_CONFIG;

+	command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);

+	

+	if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)

+		return EXIT_FAILURE;

+

+	if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)

+		return EXIT_FAILURE;

+	

+	command_done(cfg_cmd_ctx);

+

+	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");

+

+	if (target_init(cmd_ctx) != ERROR_OK)

+		return EXIT_FAILURE;

+	DEBUG("target init complete");

+

+	if (flash_init_drivers(cmd_ctx) != ERROR_OK)

+		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();

+

+	/* 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;

+}