X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=df4f8a9fc38fc11e0e57d3bee073ef7fe82223e0;hb=d8490491e672cef628528904df559cdc618bbfd7;hp=13b0555965c9d02e7f0423695205861c9c2eabae;hpb=a3035243dcb3dd9e588bbc56684222415ff28312;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 13b0555965..df4f8a9fc3 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -71,7 +71,7 @@ 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 */
 	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	LOG_OUTPUT( "$URL$\n");
+	LOG_OUTPUT("$URL$\n");
 	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
 	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
 	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
@@ -79,17 +79,12 @@ void print_version(void)
 	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
 }
 
-
-
-
-
-
-
-
-
 /* 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)
 {
+	if (argc!=0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	command_print(cmd_ctx, OPENOCD_VERSION);
 
 	return ERROR_OK;
@@ -106,8 +101,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;
@@ -116,18 +121,24 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 	return ERROR_OK;
 }
 
+int ioutil_init(struct command_context_s *cmd_ctx);
+
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
 int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+
+	if (argc!=0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	int retval;
 	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");
@@ -149,7 +160,7 @@ 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");
@@ -175,7 +186,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 +195,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);
@@ -211,13 +222,16 @@ 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");
 
 	return cmd_ctx;
 }
 
+int httpd_start(void);
+void httpd_stop(void);
+
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
@@ -229,27 +243,39 @@ 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");
+
+#if BUILD_IOUTIL
+	if (ioutil_init(cmd_ctx) != ERROR_OK)
+	{
+		return EXIT_FAILURE;
+	}
+#endif
+
+	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 BUILD_HTTPD
+	if (httpd_start()!=ERROR_OK)
+		return EXIT_FAILURE;
+#endif
+
+	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,10 +283,15 @@ int openocd_main(int argc, char *argv[])
 	/* shut server down */
 	server_quit();
 
+#if BUILD_HTTPD
+	httpd_stop();
+#endif
+
 	unregister_all_commands(cmd_ctx);
-	
+
 	/* free commandline interface */
 	command_done(cmd_ctx);
 
+
 	return EXIT_SUCCESS;
 }