[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-101-g4882647

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  4882647f3ee7fc0680c49fbd27a484359fd7e86a (commit)
      from  526347f95928b7968345dafc72c4664217e3772c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4882647f3ee7fc0680c49fbd27a484359fd7e86a
Author: David Brownell <dbr...@us...>
Date:   Mon Nov 9 09:40:55 2009 -0800

    User's Guide: bugfix global state info
    
    The "$ocd_HOSTOS" variable was wrongly documented.  Fix its
    documentation, and its value on Linux.
    
    Shrink a few of the too-long lines.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index e84f4c8..d869f38 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -6476,10 +6476,8 @@ called "flash_banks".
 
 @section OpenOCD specific Global Variables
 
-@subsection HostOS
-
 Real Tcl has ::tcl_platform(), and platform::identify, and many other
-variables. JimTCL, as implemented in OpenOCD creates $HostOS which
+variables. JimTCL, as implemented in OpenOCD creates $ocd_HOSTOS which
 holds one of the following values:
 
 @itemize @bullet
diff --git a/src/helper/command.c b/src/helper/command.c
index ca83ec6..bd317e6 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -717,7 +717,7 @@ command_context_t* command_init()
 	 * "winxx" is generic.
 	 */
 	HostOs = "winxx";
-#elif defined(__LINUX__)
+#elif defined(__linux__)
 	HostOs = "linux";
 #elif defined(__DARWIN__)
 	HostOs = "darwin";
@@ -726,9 +726,11 @@ command_context_t* command_init()
 #elif defined(__MINGW32__)
 	HostOs = "mingw32";
 #else
+#warn unrecognized host OS...
 	HostOs = "other";
 #endif
-	Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS", Jim_NewStringObj(interp, HostOs , strlen(HostOs)));
+	Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS",
+			Jim_NewStringObj(interp, HostOs , strlen(HostOs)));
 
 	Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
 	Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);
@@ -749,16 +751,19 @@ command_context_t* command_init()
 #endif
 	if (Jim_Eval_Named(interp, startup_tcl, "embedded:startup.tcl",1) == JIM_ERR)
 	{
-		LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD compile time)");
+		LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD)");
 		Jim_PrintErrorMessage(interp);
 		exit(-1);
 	}
 
-	register_command(context, NULL, "sleep", handle_sleep_command,
-					 COMMAND_ANY, "<n> [busy] - sleep for n milliseconds. \"busy\" means busy wait");
-
-	register_command(context, NULL, "fast", handle_fast_command,
-					 COMMAND_ANY, "fast <enable/disable> - place at beginning of config files. Sets defaults to fast and dangerous.");
+	register_command(context, NULL, "sleep",
+			handle_sleep_command, COMMAND_ANY,
+			"<n> [busy] - sleep for n milliseconds. "
+			"\"busy\" means busy wait");
+	register_command(context, NULL, "fast",
+			handle_fast_command, COMMAND_ANY,
+			"fast <enable/disable> - place at beginning of "
+			"config files. Sets defaults to fast and dangerous.");
 
 	return context;
 }

-----------------------------------------------------------------------

Summary of changes:
 doc/openocd.texi     |    4 +---
 src/helper/command.c |   21 +++++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository