imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

User's Guide: bugfix global state info

Browse Source 
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 <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-11-09 09:40:55 -08:00
parent 526347f959
commit 4882647f3e
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/openocd.texi
View File

@ -6476,10 +6476,8 @@ called "flash_banks".
@section OpenOCD specific Global Variables @section OpenOCD specific Global Variables
@subsection HostOS
Real Tcl has ::tcl_platform(), and platform::identify, and many other 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: holds one of the following values:
@itemize @bullet @itemize @bullet

21
src/helper/command.c
View File

@ -717,7 +717,7 @@ command_context_t* command_init()
* "winxx" is generic. * "winxx" is generic.
*/ */
HostOs = "winxx"; HostOs = "winxx";
#elif defined(__LINUX__) #elif defined(__linux__)
HostOs = "linux"; HostOs = "linux";
#elif defined(__DARWIN__) #elif defined(__DARWIN__)
HostOs = "darwin"; HostOs = "darwin";
@ -726,9 +726,11 @@ command_context_t* command_init()
#elif defined(__MINGW32__) #elif defined(__MINGW32__)
HostOs = "mingw32"; HostOs = "mingw32";
#else #else
#warn unrecognized host OS...
HostOs = "other"; HostOs = "other";
#endif #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, "ocd_find", jim_find, NULL, NULL);
Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL); Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);
@ -749,16 +751,19 @@ command_context_t* command_init()
#endif #endif
if (Jim_Eval_Named(interp, startup_tcl, "embedded:startup.tcl",1) == JIM_ERR) 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); Jim_PrintErrorMessage(interp);
exit(-1); exit(-1);
} }
register_command(context, NULL, "sleep", handle_sleep_command, register_command(context, NULL, "sleep",
COMMAND_ANY, "<n> [busy] - sleep for n milliseconds. \"busy\" means busy wait"); handle_sleep_command, COMMAND_ANY,
"<n> [busy] - sleep for n milliseconds. "
register_command(context, NULL, "fast", handle_fast_command, "\"busy\" means busy wait");
COMMAND_ANY, "fast <enable/disable> - place at beginning of config files. Sets defaults to fast and dangerous."); 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; return context;
} }